Extended module profiles.

Each module now sets the QT_CONFIG variable itself.

10 files changed, 40 insertions, 28 deletions

diff --git a/configure b/configure
index 9a0438010c..5888b1bcaf 100755
--- a/configure
+++ b/configure
@@ -6958,12 +6958,13 @@ esac
 
 # enable Qt 3 support functionality
 if [ "$CFG_QT3SUPPORT" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG qt3support"
+    QT_CONFIG="$QT_CONFIG gui-qt3support"
 fi
 
 # enable Phonon
 if [ "$CFG_PHONON" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG phonon"
+    # No longer needed after modularization
+    #QT_CONFIG="$QT_CONFIG phonon"
     if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
         QT_CONFIG="$QT_CONFIG phonon-backend"
     fi
@@ -7538,17 +7539,19 @@ if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
 elif [ "$CFG_EXCEPTIONS" = "no" ]; then
     CFG_XMLPATTERNS="no"
 fi
-if [ "$CFG_XMLPATTERNS" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG xmlpatterns"
-else
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS"
-fi
+# No longer needed after modularization
+#if [ "$CFG_XMLPATTERNS" = "yes" ]; then
+#    QT_CONFIG="$QT_CONFIG xmlpatterns"
+#else
+#    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS"
+#fi
 
-if [ "$CFG_MULTIMEDIA" = "no" ]; then
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA"
-else
-    QT_CONFIG="$QT_CONFIG multimedia"
-fi
+# No longer needed after modularization
+#if [ "$CFG_MULTIMEDIA" = "no" ]; then
+#    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA"
+#else
+#    QT_CONFIG="$QT_CONFIG multimedia"
+#fi
 
 if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG audio-backend"
@@ -7574,26 +7577,24 @@ if [ "$CFG_WEBKIT" != "no" ]; then
 fi
 
 if [ "$CFG_WEBKIT" != "no" ]; then
-    # This include takes care of adding "webkit" to QT_CONFIG.
-    cp -f "$relpath/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri" "$outpath/mkspecs/modules/qt_webkit_version.pri"
+    # No longer needed after modularization
+    #QT_CONFIG="$QT_CONFIG webkit"
     # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
     if [ "$CFG_WEBKIT" = "debug" ]; then
         QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug"
     fi
-else
-    rm -f "$outpath/mkspecs/modules/qt_webkit_version.pri"
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT"
 fi
 
 if [ "$CFG_SCRIPT" = "auto" ]; then
     CFG_SCRIPT="yes"
 fi
 
-if [ "$CFG_SCRIPT" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG script"
-else
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT"
-fi
+# No longer needed after modularization
+#if [ "$CFG_SCRIPT" = "yes" ]; then
+#    QT_CONFIG="$QT_CONFIG script"
+#else
+#    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT"
+#fi
 
 if [ "$CFG_SCRIPTTOOLS" = "yes" -a "$CFG_SCRIPT" = "no" ]; then
     echo "QtScriptTools was requested, but it can't be built due to QtScript being disabled."
@@ -7612,11 +7613,12 @@ elif [ "$CFG_SCRIPT" = "no" ]; then
     CFG_SCRIPTTOOLS="no"
 fi
 
-if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG scripttools"
-else
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
-fi
+# No longer needed after modularization
+#if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then
+#    QT_CONFIG="$QT_CONFIG scripttools"
+#else
+#    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
+#fi
 
 
 if [ "$CFG_DECLARATIVE" = "yes" ]; then
@@ -7634,7 +7636,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then
 fi
 
 if [ "$CFG_DECLARATIVE" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG declarative"
+    # No longer needed after modularization
+    #QT_CONFIG="$QT_CONFIG declarative"
     if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then
         QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL"
     fi
diff --git a/src/modules/qt_core.pri b/src/modules/qt_core.pri
index 92e1d21069..494f96f6d9 100644
--- a/src/modules/qt_core.pri
+++ b/src/modules/qt_core.pri
@@ -9,3 +9,4 @@ QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private
 QT.core.sources = $$QT_MODULE_BASE/src/corelib
 QT.core.libs = $$QT_MODULE_LIB_BASE
 QT.core.depends =
+QT.core.DEFINES = QT_CORE_LIB
diff --git a/src/modules/qt_dbus.pri b/src/modules/qt_dbus.pri
index 0a0618eb4f..73fdf99446 100644
--- a/src/modules/qt_dbus.pri
+++ b/src/modules/qt_dbus.pri
@@ -10,3 +10,4 @@ QT.dbus.sources = $$QT_MODULE_BASE/src/dbus
 QT.dbus.libs = $$QT_MODULE_LIB_BASE
 QT.dbus.depends = core xml
 QT.dbus.CONFIG = dbusadaptors dbusinterfaces
+QT.dbus.DEFINES = QT_DBUS_LIB
diff --git a/src/modules/qt_gui.pri b/src/modules/qt_gui.pri
index e88be8fe95..74d2931444 100644
--- a/src/modules/qt_gui.pri
+++ b/src/modules/qt_gui.pri
@@ -9,3 +9,4 @@ QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/private
 QT.gui.sources = $$QT_MODULE_BASE/src/gui
 QT.gui.libs = $$QT_MODULE_LIB_BASE
 QT.gui.depends = core network
+QT.gui.DEFINES = QT_GUI_LIB
diff --git a/src/modules/qt_network.pri b/src/modules/qt_network.pri
index d0fe25121e..c8b1f00939 100644
--- a/src/modules/qt_network.pri
+++ b/src/modules/qt_network.pri
@@ -9,3 +9,4 @@ QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private
 QT.network.sources = $$QT_MODULE_BASE/src/network
 QT.network.libs = $$QT_MODULE_LIB_BASE
 QT.network.depends = core
+QT.network.DEFINES = QT_NETWORK_LIB
diff --git a/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri
index a552407df8..eb47b00332 100644
--- a/src/modules/qt_opengl.pri
+++ b/src/modules/qt_opengl.pri
@@ -10,3 +10,4 @@ QT.opengl.sources = $$QT_MODULE_BASE/src/opengl
 QT.opengl.libs = $$QT_MODULE_LIB_BASE
 QT.opengl.depends = core gui
 QT.opengl.CONFIG = opengl
+QT.opengl.DEFINES = QT_OPENGL_LIB
diff --git a/src/modules/qt_openvg.pri b/src/modules/qt_openvg.pri
index 67fb6ae47f..09811bab5e 100644
--- a/src/modules/qt_openvg.pri
+++ b/src/modules/qt_openvg.pri
@@ -10,3 +10,4 @@ QT.openvg.sources = $$QT_MODULE_BASE/src/openvg
 QT.openvg.libs = $$QT_MODULE_LIB_BASE
 QT.openvg.depends = core gui
 QT.openvg.CONFIG = openvg
+QT.openvg.DEFINES = QT_OPENVG_LIB
diff --git a/src/modules/qt_sql.pri b/src/modules/qt_sql.pri
index 3ca3df9915..42dde1bb65 100644
--- a/src/modules/qt_sql.pri
+++ b/src/modules/qt_sql.pri
@@ -9,3 +9,4 @@ QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private
 QT.sql.sources = $$QT_MODULE_BASE/src/sql
 QT.sql.libs = $$QT_MODULE_LIB_BASE
 QT.sql.depends = core
+QT.sql.DEFINES = QT_SQL_LIB
diff --git a/src/modules/qt_testlib.pri b/src/modules/qt_testlib.pri
index 44ebf3c4ab..5971808711 100644
--- a/src/modules/qt_testlib.pri
+++ b/src/modules/qt_testlib.pri
@@ -10,3 +10,4 @@ QT.testlib.sources = $$QT_MODULE_BASE/src/testlib
 QT.testlib.libs = $$QT_MODULE_LIB_BASE
 QT.testlib.depends = core
 QT.testlib.CONFIG = console
+QT.testlib.DEFINES = QT_TESTLIB_LIB
diff --git a/src/modules/qt_xml.pri b/src/modules/qt_xml.pri
index 8c47bfc9f4..c0c630c2ed 100644
--- a/src/modules/qt_xml.pri
+++ b/src/modules/qt_xml.pri
@@ -9,3 +9,4 @@ QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private
 QT.xml.sources = $$QT_MODULE_BASE/src/xml
 QT.xml.libs = $$QT_MODULE_LIB_BASE
 QT.xml.depends = core
+QT.xml.DEFINES = QT_XML_LIB