6 files changed, 48 insertions, 18 deletions
diff --git a/src/modules/qt_gui.pri b/src/modules/qt_gui.pri
index 0d1b2109f8..2dfbb4a604 100644
--- a/src/modules/qt_gui.pri
+++ b/src/modules/qt_gui.pri
@@ -10,5 +10,6 @@ QT.gui.sources = $$QT_MODULE_BASE/src/gui
 QT.gui.libs = $$QT_MODULE_LIB_BASE
 QT.gui.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.gui.imports = $$QT_MODULE_IMPORT_BASE
-QT.gui.depends = core network
+QT.gui.depends = core
+QT.gui.CONFIG = opengl
 QT.gui.DEFINES = QT_GUI_LIB
diff --git a/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri
index 2cc9b8682c..22476cf949 100644
--- a/src/modules/qt_opengl.pri
+++ b/src/modules/qt_opengl.pri
@@ -11,6 +11,6 @@ QT.opengl.sources = $$QT_MODULE_BASE/src/opengl
 QT.opengl.libs = $$QT_MODULE_LIB_BASE
 QT.opengl.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.opengl.imports = $$QT_MODULE_IMPORT_BASE
-QT.opengl.depends = core gui
+QT.opengl.depends = core gui widgets
 QT.opengl.CONFIG = opengl
 QT.opengl.DEFINES = QT_OPENGL_LIB
diff --git a/src/modules/qt_openvg.pri b/src/modules/qt_openvg.pri
deleted file mode 100644
index a773eb0cca..0000000000
--- a/src/modules/qt_openvg.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-QT.openvg.VERSION = 5.0.0
-QT.openvg.MAJOR_VERSION = 5
-QT.openvg.MINOR_VERSION = 0
-QT.openvg.PATCH_VERSION = 0
-
-QT.openvg.name = QtOpenVG
-QT.openvg.bins = $$QT_MODULE_BIN_BASE
-QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG
-QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/$$QT.openvg.VERSION
-QT.openvg.sources = $$QT_MODULE_BASE/src/openvg
-QT.openvg.libs = $$QT_MODULE_LIB_BASE
-QT.openvg.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.openvg.imports = $$QT_MODULE_IMPORT_BASE
-QT.openvg.depends = core gui
-QT.openvg.CONFIG = openvg
-QT.openvg.DEFINES = QT_OPENVG_LIB
diff --git a/src/modules/qt_platformsupport.pri b/src/modules/qt_platformsupport.pri
new file mode 100644
index 0000000000..152f69b3e9
--- /dev/null
+++ b/src/modules/qt_platformsupport.pri
@@ -0,0 +1,15 @@
+QT.platformsupport.VERSION = 5.0.0
+QT.platformsupport.MAJOR_VERSION = 5
+QT.platformsupport.MINOR_VERSION = 0
+QT.platformsupport.PATCH_VERSION = 0
+
+QT.platformsupport.name = QtPlatformSupport
+QT.platformsupport.bins = $$QT_MODULE_BIN_BASE
+QT.platformsupport.includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport
+QT.platformsupport.private_includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport/$$QT.platformsupport.VERSION
+QT.platformsupport.sources = $$QT_MODULE_BASE/src/platformsupport
+QT.platformsupport.libs = $$QT_MODULE_LIB_BASE
+QT.platformsupport.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.platformsupport.imports = $$QT_MODULE_IMPORT_BASE
+QT.platformsupport.depends = core gui
+QT.platformsupport.DEFINES =
diff --git a/src/modules/qt_printsupport.pri b/src/modules/qt_printsupport.pri
new file mode 100644
index 0000000000..898f8b82b6
--- /dev/null
+++ b/src/modules/qt_printsupport.pri
@@ -0,0 +1,16 @@
+QT.printsupport.VERSION = 5.0.0
+QT.printsupport.MAJOR_VERSION = 5
+QT.printsupport.MINOR_VERSION = 0
+QT.printsupport.PATCH_VERSION = 0
+
+QT.printsupport.name = QtPrintSupport
+QT.printsupport.includes = $$QT_MODULE_INCLUDE_BASE/QtPrintSupport
+QT.printsupport.private_includes = $$QT_MODULE_INCLUDE_BASE/QtPrintSupport/$$QT.printsupport.VERSION
+QT.printsupport.sources = $$QT_MODULE_BASE/src/printsupport
+QT.printsupport.libs = $$QT_MODULE_LIB_BASE
+QT.printsupport.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.printsupport.imports = $$QT_MODULE_IMPORT_BASE
+QT.printsupport.depends = core gui widgets
+QT.printsupport.DEFINES = QT_PRINTSUPPORT_LIB
+# To be implemented:
+win32: QT.printsupport.DEFINES *= QT_NO_PRINTER
diff --git a/src/modules/qt_widgets.pri b/src/modules/qt_widgets.pri
new file mode 100644
index 0000000000..95d2489cf9
--- /dev/null
+++ b/src/modules/qt_widgets.pri
@@ -0,0 +1,14 @@
+QT.widgets.VERSION = 5.0.0
+QT.widgets.MAJOR_VERSION = 5
+QT.widgets.MINOR_VERSION = 0
+QT.widgets.PATCH_VERSION = 0
+
+QT.widgets.name = QtWidgets
+QT.widgets.includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets
+QT.widgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets/$$QT.widgets.VERSION
+QT.widgets.sources = $$QT_MODULE_BASE/src/widgets
+QT.widgets.libs = $$QT_MODULE_LIB_BASE
+QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.widgets.imports = $$QT_MODULE_IMPORT_BASE
+QT.widgets.depends = core network gui
+QT.widgets.DEFINES = QT_WIDGETS_LIB