Changeset 85

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.

Location:

trunk

Files:

• mkspecs/os2-g++/qmake.conf (modified) (2 diffs)
• qmake/generators/os2/gnumake.cpp (modified) (1 diff)
• src/qt.pro (modified) (1 diff)

trunk/mkspecs/os2-g++/qmake.conf

@@ -60 +60 @@
 QMAKE_INCDIR_QT         = $(QTDIR)\include
 QMAKE_LIBDIR_QT         = $(QTDIR)\lib
+QMAKE_LIBDIR_QT_DEBUG   = $(QTDIR)\lib\debug
 
 # As a workaround for the CMD.EXE command line length limitation (1024 chars)
@@ -133 +134 @@
 QMAKE_LIBS_WINDOWS      =
 QMAKE_LIBS_QT           = qt registry.dll socket
-QMAKE_LIBS_QT_THREAD    = qt-mt registry.dll socket
+QMAKE_LIBS_QT_THREAD    = qt registry.dll socket
 QMAKE_LIBS_QT_DLL       = qt
-QMAKE_LIBS_QT_THREAD_DLL= qt-mt
+QMAKE_LIBS_QT_THREAD_DLL= qt
 QMAKE_LIBS_QT_ENTRY     =
 

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()) {

trunk/src/qt.pro

@@ -10 +10 @@
 DESTDIR         = $$QMAKE_LIBDIR_QT
 DLLDESTDIR      = ../bin
+
+os2:CONFIG      += build_qt 
+
+debug:os2 {
+        DESTDIR         = $$QMAKE_LIBDIR_QT_DEBUG
+        DLLDESTDIR      = ../bin/debug
+}
 
 CONFIG          += qt warn_on depend_includepath