summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-10-07 11:28:25 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-10-07 12:25:47 (GMT)
commit75b41faff44a1488d88eca6e910d4b617cb42221 (patch)
treeed78fe10695559cf9f1752b83575e9ef2f62c008 /mkspecs
parent722d351de797135273a05ff0f4c63315bf37592d (diff)
downloadQt-75b41faff44a1488d88eca6e910d4b617cb42221.zip
Qt-75b41faff44a1488d88eca6e910d4b617cb42221.tar.gz
Qt-75b41faff44a1488d88eca6e910d4b617cb42221.tar.bz2
Avoid adding a debug library to the glue projects, when debug_and_release
The VCPROJ/SLN generator generates dependencies on the glue project, so the glue must use the correct library for the dependencies to be correct. The qtAddLibrary() would add the project 'default' to the glue, which could end up adding a debug lib to the glue, so the dependency checker wouldn't find the proper project. We therefore force qtAddLibrary to only add d/_debug if we're not using debug_and_release, or not in the glue part Reviewed-by: Rohan McGovern
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_functions.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 243a829..6322233 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -50,7 +50,7 @@ defineTest(qtAddLibrary) {
INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
}
isEmpty(LINKAGE) {
- CONFIG(debug, debug|release) {
+ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
}