AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generalize the check for gui in static plugin import generation

Browse Source 
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>
This commit is contained in:
Miikka Heikkinen 2012-12-20 10:07:20 +02:00 committed by The Qt Project
parent 3a810c8238
commit 889e991773
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt.prf
View File

@ -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: \

4
src/gui/gui.pro
View File

@ -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