diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 11:50:04 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 22:08:29 +0100 |
| commit | dcb710dd87ab15c3af803133ff2449902dbec036 (patch) | |
| tree | 1f3ed87165f05e45260ff45fb15d5df96d684abb /mkspecs/features/qt_plugin.prf | |
| parent | 4606ea53958df33fffba680dd75c8b1733ca9f40 (diff) | |
| parent | e47c2744e6cefa42fc70320e07d534742934f737 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/features/unix/separate_debug_info.prf
src/gui/kernel/qwindow_p.h
src/plugins/platforms/cocoa/qcocoacursor.mm
tests/auto/tools/moc/tst_moc.cpp
Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf
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 |