Changeset 83 for trunk

Timestamp:

Apr 15, 2006, 5:29:11 PM (19 years ago)

Author:

dmik

Message:

Don't try to substitute 'qt-mt' with 'qt' and vice versa when processing .prl files on OS/2.

File:

• trunk/qmake/generators/makefile.cpp (modified) (2 diffs)

trunk/qmake/generators/makefile.cpp

@@ -1250 +1250 @@
     }
     meta_file = fileFixify(meta_file);
+#if defined(Q_OS_OS2)
+    // As far as I understand, this code tries to load "qt-mt" prl if "qt" is
+    // specified, but not found, and vice versa. First of all, I don't get why
+    // we should do that (the user has specified he wants a particular single-
+    // threaded or multi-threadad version using the "thread" CONFIG keyword).
+    // And more over, the -mt suffix is no more used on OS/2.
+#else    
     if(!QMakeMetaInfo::libExists(fileFixify(meta_file, QDir::currentDirPath(), Option::output_dir)) &&
        project->isActiveConfig("qt")) {
@@ -1279 +1286 @@
         }
     }
+#endif    
     QString real_meta_file = Option::fixPathToLocalOS(meta_file);
     if(project->variables()["QMAKE_PRL_INTERNAL_FILES"].findIndex(QMakeMetaInfo::findLib(meta_file)) != -1) {