diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-15 19:28:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 15:52:43 +0100 |
| commit | 489d8a0627c46092d20f476d5521ecafd42e5ce5 (patch) | |
| tree | 60e78d7ad6044def49a6516e1f3e178e58986c7f /mkspecs/features/qt_module.prf | |
| parent | 2e4ce301f98d3f463a7151c21dc8cc407cd8702c (diff) | |
add QT_CONFIG's static/shared to CONFIG on startup
... instead of as a fallback in default_post.
it was this way in qt4, and it requires less code to be written in the
end. we are already doing it for debug/release as well.
Change-Id: I6e02849d61d14a18375cf64a5990768931ebac48
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/qt_module.prf')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index e6263af7a5..728d1f5f85 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -25,12 +25,6 @@ isEmpty(VERSION):VERSION = $$QT_VERSION # Compile as shared/DLL or static according to the option given to configure # unless overridden. Host builds are always static host_build|staticlib: CONFIG += static -!static:!shared { - contains(QT_CONFIG, static): \ - CONFIG += static - else: \ - CONFIG += shared -} ucmodule = $$upper($$MODULE) @@ -87,7 +81,7 @@ contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_no contains(QT_CONFIG, c++11):CONFIG += c++11 #mac frameworks -mac:!static:contains(QT_CONFIG, qt_framework) { +mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { #QMAKE_FRAMEWORK_VERSION = 4.0 CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework CONFIG(release, debug|release) { |