tagged rc7

This commit is contained in:
Christophe Dumez
2007-11-03 12:00:41 +00:00
parent b7fd7d9837
commit cce2f9f69f
156 changed files with 35530 additions and 17985 deletions

View File

@@ -44,13 +44,15 @@ public:
s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
if(!s.isEmpty()) {
if(!QFile::exists(s+QString("libMagick++.so"))){
if(!QFile::exists(s+QString("/libMagick++.so"))){
return false;
}
}else{
QStringList sl;
sl << "/usr/lib/";
sl << "/usr/lib64/";
sl << "/usr/local/lib/";
sl << "/usr/local/lib64/";
bool found = false;
foreach(s, sl){
if(QFile::exists(s+QString("libMagick++.so"))){
@@ -69,6 +71,7 @@ public:
magickConfig.waitForStarted();
magickConfig.waitForFinished();
QByteArray result = magickConfig.readAll();
result = result.replace("\n", "");
conf->addLib(result.data());
conf->addDefine("HAVE_MAGICK");
return true;