diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-12-20 10:07:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-20 13:59:46 +0100 |
| commit | 889e9917731af71762becaf61d8154888178ab39 (patch) | |
| tree | 36e36099c6a5b8e23a4188519f72c8cef698f0b7 | |
| parent | 3a810c8238c712d308709da7f459476e8c5f42bf (diff) | |
Generalize the check for gui in static plugin import generation
Generalize the check for gui by checking for needs_qpa_plugin
CONFIG value instead, which gui adds to MODULE_CONFIG.
Task-number: QTBUG-28215
Change-Id: I5834a3f81e5c3868ee1a3fa405ebc6410db1f900
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
| -rw-r--r-- | src/gui/gui.pro | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 2db61f734a..9e36b6da16 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -76,7 +76,7 @@ QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN contains(QT_CONFIG, static) { QT_PLUGIN_VERIFY += QTPLUGIN force_import_plugins|contains(TEMPLATE, .*app) { - contains(QT, gui):import_qpa_plugin { + needs_qpa_plugin:import_qpa_plugin { qpa_minimal_plugin: \ QTPLUGIN += qminimal else: \ diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 5f94426c94..058cfe92ec 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -1,6 +1,8 @@ TARGET = QtGui QT = core-private -contains(QT_CONFIG, opengl.*):MODULE_CONFIG = opengl + +MODULE_CONFIG = needs_qpa_plugin +contains(QT_CONFIG, opengl.*):MODULE_CONFIG += opengl DEFINES += QT_NO_USING_NAMESPACE |