Changeset 363 for trunk/qmake/project.cpp

Timestamp:

Nov 30, 2009, 6:52:30 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

global: Reverted r355, r356, r361, r362 (see #78).

File:

• trunk/qmake/project.cpp (modified) (2 diffs)

trunk/qmake/project.cpp

@@ -1457 +1457 @@
                 if (QFile::exists(qmakespec+"/qmake.conf")) {
                     Option::mkfile::qmakespec = QFileInfo(Option::mkfile::qmakespec).absoluteFilePath();
+                } else if (QFile::exists(Option::output_dir+"/"+qmakespec+"/qmake.conf")) {
+                    qmakespec = Option::mkfile::qmakespec = QFileInfo(Option::output_dir+"/"+qmakespec).absoluteFilePath();
                 } else {
-                    QString tmp = QDir(Option::output_dir).absoluteFilePath(qmakespec);
-                    if (QFile::exists(tmp+"/qmake.conf"))
-                        qmakespec = Option::mkfile::qmakespec = tmp;
-                    else {
-                        bool found_mkspec = false;
-                        foreach(const QString &root, mkspec_roots) {
-                            QString mkspec = QDir(root).absoluteFilePath(qmakespec);
-                            if(QFile::exists(mkspec)) {
-                                found_mkspec = true;
-                                Option::mkfile::qmakespec = qmakespec = mkspec;
-                                break;
-                            }
+                    bool found_mkspec = false;
+                    for(QStringList::ConstIterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) {
+                        QString mkspec = (*it) + QDir::separator() + qmakespec;
+                        if(QFile::exists(mkspec)) {
+                            found_mkspec = true;
+                            Option::mkfile::qmakespec = qmakespec = mkspec;
+                            break;
                         }
-                        if(!found_mkspec) {
-                            fprintf(stderr, "Could not find mkspecs for your QMAKESPEC(%s) after trying:\n\t%s\n",
-                                    qmakespec.toLatin1().constData(), mkspec_roots.join("\n\t").toLatin1().constData());
-                            return false;
-                        }
+                    }
+                    if(!found_mkspec) {
+                        fprintf(stderr, "Could not find mkspecs for your QMAKESPEC(%s) after trying:\n\t%s\n",
+                                qmakespec.toLatin1().constData(), mkspec_roots.join("\n\t").toLatin1().constData());
+                        return false;
                     }
                 }
@@ -1778 +1775 @@
             include_roots << qmake_getpwd();
         include_roots << Option::output_dir;
-        foreach(const QString &root, include_roots) {
-            QString testName = QDir(root).absoluteFilePath(file);
+        for(int root = 0; root < include_roots.size(); ++root) {
+            QString testName = QDir::toNativeSeparators(include_roots[root]);
+            if (!testName.endsWith(QString(QDir::separator())))
+                testName += QDir::separator();
+            testName += file;
             if(QFile::exists(testName)) {
                 file = testName;