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_plugin.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_plugin.prf')
| -rw-r--r-- | mkspecs/features/qt_plugin.prf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index 2ec523d78c..54a995daae 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -28,10 +28,7 @@ contains(QT_CONFIG, separate_debug_info):CONFIG += separate_debug_info contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_nocopy contains(QT_CONFIG, c++11):CONFIG += c++11 -contains(QT_CONFIG, static):CONFIG += static -else:CONFIG += shared - -static { +CONFIG(static, static|shared) { isEmpty(MODULE): MODULE = $$basename(TARGET) MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_plugin_$${MODULE}.pri |