Changeset 96

Timestamp:

Aug 3, 2009, 1:23:29 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: When using debug-and-release mode on OS/2, debug versions of Qt DLLs get the "d" suffix (QtGuid4.dll) etc to let them to co-exist in the same lib/bin directory (similar to Win32 and Mac platforms).

Location:

trunk/mkspecs/features

Files:

• qt.prf (modified) (1 diff)
• qt_functions.prf (modified) (2 diffs)
• uitools.prf (modified) (1 diff)

trunk/mkspecs/features/qt.prf

@@ -95 +95 @@
         } else {
             QT_LINKAGE = -l$${QTPLUG}
-            win32 {
+            win32 {
                CONFIG(debug, debug|release):QT_LINKAGE = -l$${QTPLUG}d
             } else:mac {

trunk/mkspecs/features/qt_functions.prf

@@ -9 +9 @@
       !debug_and_release|build_pass {
           mac:RET = $$member(LIBRARY_NAME, 0)_debug
-              else:win32:RET = $$member(LIBRARY_NAME, 0)d
+              else:win32:RET = $$member(LIBRARY_NAME, 0)d
       }
    }
@@ -48 +48 @@
     isEmpty(LINKAGE) {
        CONFIG(debug, debug|release) {
-           win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
+           win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
            mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
        }

trunk/mkspecs/features/uitools.prf

@@ -6 +6 @@
 CONFIG(debug, debug|release) {
     mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
+    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
 }
 LIBS += $$QTUITOOLS_LINKAGE