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