Changeset 85 for trunk/qmake

Timestamp:

Apr 15, 2006, 6:21:17 PM (19 years ago)

Author:

dmik

Message:

• Added QMAKE_LIBDIR_QT_DEBUG internal QMAKE variable that is used to define a directory used to store and locate the debug version of the Qt dll
• When 'qt' is present in CONFIG, the GNUMAKE backend places the values of QMAKE_LIBDIR_QT_DEBUG followed by the value of QMAKE_LIBDIR_QT to the library search path if 'debug' is also present there, otherwise these values are placed in the opposite order.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (1 diff)

trunk/qmake/generators/os2/gnumake.cpp

@@ -526 +526 @@
         project->variables()["CONFIG"].append("moc");
         project->variables()["INCLUDEPATH"] +=  project->variables()["QMAKE_INCDIR_QT"];
-        project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
-        if ( !project->isActiveConfig("debug") )
+        if ( !project->isActiveConfig("debug") ) {
+            project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+            project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT_DEBUG"];
             project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
+        } else {
+            project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT_DEBUG"];
+            project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+        }
         if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
             if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) {