5 files changed, 44 insertions, 4 deletions
diff --git a/modules/qt_clucene.pri b/modules/qt_clucene.pri
index 49e79f5b6..e8d56b5f7 100644
--- a/modules/qt_clucene.pri
+++ b/modules/qt_clucene.pri
@@ -7,8 +7,11 @@ QT.clucene.name = QtCLucene
 QT.clucene.bins = $$QT_MODULE_BIN_BASE
 QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucene
 QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/$$QT.clucene.VERSION
-QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch
+QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/clucene
 QT.clucene.libs = $$QT_MODULE_LIB_BASE
 QT.clucene.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.clucene.imports = $$QT_MODULE_IMPORT_BASE
 QT.clucene.depends = core
+QT.clucene.defines = QT_CLUCLENE_LIB
+
+QT_CONFIG += clucene
diff --git a/modules/qt_designer.pri b/modules/qt_designer.pri
index 2a2ce8a86..faf22047b 100644
--- a/modules/qt_designer.pri
+++ b/modules/qt_designer.pri
@@ -11,5 +11,7 @@ QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib
 QT.designer.libs = $$QT_MODULE_LIB_BASE
 QT.designer.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.designer.imports = $$QT_MODULE_IMPORT_BASE
-QT.designer.depends = xml
+QT.designer.depends = core xml gui widgets
 QT.designer.DEFINES = QT_DESIGNER_LIB
+
+QT_CONFIG += designer
diff --git a/modules/qt_designercomponents.pri b/modules/qt_designercomponents.pri
new file mode 100644
index 000000000..a453c7949
--- /dev/null
+++ b/modules/qt_designercomponents.pri
@@ -0,0 +1,16 @@
+QT.designercomponents.VERSION = 5.0.0
+QT.designercomponents.MAJOR_VERSION = 5
+QT.designercomponents.MINOR_VERSION = 0
+QT.designercomponents.PATCH_VERSION = 0
+
+QT.designercomponents.name = QtDesignerComponents
+QT.designercomponents.bins = $$QT_MODULE_BIN_BASE
+QT.designercomponents.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesignerComponents
+QT.designercomponents.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesignerComponents/$$QT.designercomponents.VERSION
+QT.designercomponents.sources = $$QT_MODULE_BASE/src/designer/src/components/lib
+QT.designercomponents.libs = $$QT_MODULE_LIB_BASE
+QT.designercomponents.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.designercomponents.imports = $$QT_MODULE_IMPORT_BASE
+QT.designercomponents.depends = core xml gui widgets
+
+QT_CONFIG += designercomponents
diff --git a/modules/qt_help.pri b/modules/qt_help.pri
index f4e088780..a61086ccc 100644
--- a/modules/qt_help.pri
+++ b/modules/qt_help.pri
@@ -7,9 +7,11 @@ QT.help.name = QtHelp
 QT.help.bins = $$QT_MODULE_BIN_BASE
 QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp
 QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/$$QT.help.VERSION
-QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib
+QT.help.sources = $$QT_MODULE_BASE/src/assistant/help
 QT.help.libs = $$QT_MODULE_LIB_BASE
 QT.help.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.help.imports = $$QT_MODULE_IMPORT_BASE
-QT.help.depends = network xml sql
+QT.help.depends = network sql
 QT.help.DEFINES = QT_HELP_LIB
+
+QT_CONFIG += help
diff --git a/modules/qt_uitools.pri b/modules/qt_uitools.pri
new file mode 100644
index 000000000..a0d08ccc4
--- /dev/null
+++ b/modules/qt_uitools.pri
@@ -0,0 +1,17 @@
+QT.uitools.VERSION = 5.0.0
+QT.uitools.MAJOR_VERSION = 5
+QT.uitools.MINOR_VERSION = 0
+QT.uitools.PATCH_VERSION = 0
+
+QT.uitools.name = QtUiTools
+QT.uitools.bins = $$QT_MODULE_BIN_BASE
+QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools
+QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/$$QT.uitools.VERSION
+QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools
+QT.uitools.libs = $$QT_MODULE_LIB_BASE
+QT.uitools.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.uitools.imports = $$QT_MODULE_IMPORT_BASE
+QT.uitools.depends = xml
+QT.uitools.DEFINES = QT_UITOOLS_LIB
+
+QT_CONFIG += uitools