equal
deleted
inserted
replaced
34 |
34 |
35 #In Windows we want to build libraries in debug and release mode if the user |
35 #In Windows we want to build libraries in debug and release mode if the user |
36 #didn't select a version - if Qt is build in debug_and_release |
36 #didn't select a version - if Qt is build in debug_and_release |
37 #this avoids problems for third party as qmake build debug by default |
37 #this avoids problems for third party as qmake build debug by default |
38 #If mobility selected debug_and_release but Qt only supports |
38 #If mobility selected debug_and_release but Qt only supports |
39 #one version but not the other we slently disable the impossible combination |
39 #one version but not the other we silently disable the impossible combination |
40 win32:contains(CONFIG_WIN32,build_all) { |
40 win32:contains(CONFIG_WIN32,build_all) { |
41 contains(QT_CONFIG,debug):contains(QT_CONFIG,release) { |
41 contains(QT_CONFIG,debug):contains(QT_CONFIG,release) { |
42 contains(TEMPLATE,.*lib):!plugin { |
42 contains(TEMPLATE,.*lib):!plugin { |
43 CONFIG += $$WAS_IN_DEBUG |
43 CONFIG += $$WAS_IN_DEBUG |
44 CONFIG += debug_and_release build_all |
44 CONFIG += debug_and_release build_all |
86 OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET |
86 OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET |
87 !plugin { |
87 !plugin { |
88 contains(TEMPLATE,.*lib) { |
88 contains(TEMPLATE,.*lib) { |
89 DESTDIR = $$OUTPUT_DIR/lib |
89 DESTDIR = $$OUTPUT_DIR/lib |
90 symbian:defFilePath=../s60installs |
90 symbian:defFilePath=../s60installs |
91 # VERSION = 1.0.2 |
91 VERSION = 1.0.3 |
92 } else { |
92 } else { |
93 DESTDIR = $$OUTPUT_DIR/bin |
93 DESTDIR = $$OUTPUT_DIR/bin |
94 } |
94 } |
95 } else { |
95 } else { |
96 testplugin { |
96 testplugin { |