]>
Commit | Line | Data |
---|---|---|
08c7dce5 AM |
1 | diff -up qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf.QTBUG-14467 qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf |
2 | --- qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf.QTBUG-14467 2013-05-30 16:19:17.000000000 -0500 | |
3 | +++ qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf 2013-06-09 11:53:45.709773603 -0500 | |
4 | @@ -72,7 +72,7 @@ defineTest(qtAddLibrary) { | |
5 | } | |
6 | isEmpty(LINKAGE) { | |
7 | if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { | |
8 | - win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d | |
9 | + win32:LINKAGE = -l$${LIB_NAME}d$${QT_LIBINFIX} | |
10 | mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug | |
11 | } | |
12 | isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} | |
13 | diff -up qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf.QTBUG-14467 qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf | |
14 | --- qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf.QTBUG-14467 2013-05-30 16:19:17.000000000 -0500 | |
15 | +++ qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf 2013-06-09 11:53:45.710773593 -0500 | |
16 | @@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app"){ | |
17 | ||
18 | qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { | |
19 | isEqual(entryLib, -lqtmain): { | |
20 | - CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d | |
21 | + CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}d$${QT_LIBINFIX} | |
22 | else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX} | |
23 | } else { | |
24 | QMAKE_LIBS += $${entryLib} |