From 3bc29615959e2b22d89ffb44955a5b2898e963c0 Mon Sep 17 00:00:00 2001 From: axis Date: Mon, 3 Jan 2011 19:01:57 +0100 Subject: [PATCH] Extended module profiles. Each module now sets the QT_CONFIG variable itself. --- qt3support/modules/qt_qt3support.pri | 8 ++++- qtbase/configure | 59 ++++++++++++++++-------------- qtbase/src/modules/qt_core.pri | 1 + qtbase/src/modules/qt_dbus.pri | 1 + qtbase/src/modules/qt_gui.pri | 1 + qtbase/src/modules/qt_network.pri | 1 + qtbase/src/modules/qt_opengl.pri | 1 + qtbase/src/modules/qt_openvg.pri | 1 + qtbase/src/modules/qt_sql.pri | 1 + qtbase/src/modules/qt_testlib.pri | 1 + qtbase/src/modules/qt_xml.pri | 1 + qtdeclarative/modules/qt_declarative.pri | 3 ++ qtscript/modules/qt_script.pri | 3 ++ qtscript/modules/qt_scripttools.pri | 3 ++ qtsvg/modules/qt_svg.pri | 1 + qttools/modules/qt_designer.pri | 1 + qttools/modules/qt_help.pri | 1 + qttools/modules/qt_uitools.pri | 3 ++ qtxmlpatterns/modules/qt_xmlpatterns.pri | 3 ++ 19 files changed, 65 insertions(+), 29 deletions(-) diff --git a/qt3support/modules/qt_qt3support.pri b/qt3support/modules/qt_qt3support.pri index 76ad617..5554999 100644 --- a/qt3support/modules/qt_qt3support.pri +++ b/qt3support/modules/qt_qt3support.pri @@ -9,4 +9,10 @@ QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/private QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support QT.qt3support.libs = $$QT_MODULE_LIB_BASE QT.qt3support.depends = core gui -QT.qt3support.DEFINES = QT3_SUPPORT +QT.qt3support.DEFINES = QT3_SUPPORT QT_QT3SUPPORT_LIB + +contains(QT_CONFIG, gui-qt3support) { + QT_CONFIG += qt3support +} else { + warning("Attempted to include $$QT.qt3support.name in the build, but $$QT.gui.name was not built with $$QT.qt3support.name enabled.") +} diff --git a/qtbase/configure b/qtbase/configure index fe9e311..c92af3f 100755 --- a/qtbase/configure +++ b/qtbase/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 @@ -7539,17 +7540,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" @@ -7575,26 +7578,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." @@ -7613,11 +7614,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 @@ -7635,7 +7637,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/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index 92e1d21..494f96f 100644 --- a/qtbase/src/modules/qt_core.pri +++ b/qtbase/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/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index 0a0618e..73fdf99 100644 --- a/qtbase/src/modules/qt_dbus.pri +++ b/qtbase/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/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri index e88be8f..74d2931 100644 --- a/qtbase/src/modules/qt_gui.pri +++ b/qtbase/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/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index d0fe251..c8b1f00 100644 --- a/qtbase/src/modules/qt_network.pri +++ b/qtbase/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/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index a552407..eb47b00 100644 --- a/qtbase/src/modules/qt_opengl.pri +++ b/qtbase/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/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index 67fb6ae..09811ba 100644 --- a/qtbase/src/modules/qt_openvg.pri +++ b/qtbase/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/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index 3ca3df9..42dde1b 100644 --- a/qtbase/src/modules/qt_sql.pri +++ b/qtbase/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/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index 44ebf3c..5971808 100644 --- a/qtbase/src/modules/qt_testlib.pri +++ b/qtbase/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/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index 8c47bfc..c0c630c 100644 --- a/qtbase/src/modules/qt_xml.pri +++ b/qtbase/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 diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri index c27a87e..6071af6 100644 --- a/qtdeclarative/modules/qt_declarative.pri +++ b/qtdeclarative/modules/qt_declarative.pri @@ -9,3 +9,6 @@ QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private QT.declarative.sources = $$QT_MODULE_BASE/src/declarative QT.declarative.libs = $$QT_MODULE_LIB_BASE QT.declarative.depends = gui script network +QT.declarative.DEFINES = QT_DECLARATIVE_LIB + +QT_CONFIG += declarative diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri index febdef3..4feaa25 100644 --- a/qtscript/modules/qt_script.pri +++ b/qtscript/modules/qt_script.pri @@ -9,3 +9,6 @@ QT.script.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScript/private QT.script.sources = $$QT_MODULE_BASE/src/script QT.script.libs = $$QT_MODULE_LIB_BASE QT.script.depends = core +QT.script.DEFINES = QT_SCRIPT_LIB + +QT_CONFIG += script diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri index a37cecd..e874b27 100644 --- a/qtscript/modules/qt_scripttools.pri +++ b/qtscript/modules/qt_scripttools.pri @@ -9,3 +9,6 @@ QT.scripttools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScriptTools/private QT.scripttools.sources = $$QT_MODULE_BASE/src/scripttools QT.scripttools.libs = $$QT_MODULE_LIB_BASE QT.scripttools.depends = script gui network +QT.scripttools.DEFINES = QT_SCRIPTTOOLS_LIB + +QT_CONFIG += scripttools diff --git a/qtsvg/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri index 5fa3212..90e9865 100644 --- a/qtsvg/modules/qt_svg.pri +++ b/qtsvg/modules/qt_svg.pri @@ -9,3 +9,4 @@ QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private QT.svg.sources = $$QT_MODULE_BASE/src/svg QT.svg.libs = $$QT_MODULE_LIB_BASE QT.svg.depends = core gui +QT.svg.DEFINES = QT_SVG_LIB diff --git a/qttools/modules/qt_designer.pri b/qttools/modules/qt_designer.pri index 7f0a5d3..01340ac 100644 --- a/qttools/modules/qt_designer.pri +++ b/qttools/modules/qt_designer.pri @@ -9,3 +9,4 @@ QT.designer.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib QT.designer.libs = $$QT_MODULE_LIB_BASE QT.designer.depends = xml +QT.designer.DEFINES = QT_DESIGNER_LIB diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri index f36858f..d99f57aa 100644 --- a/qttools/modules/qt_help.pri +++ b/qttools/modules/qt_help.pri @@ -9,3 +9,4 @@ QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/private QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib QT.help.libs = $$QT_MODULE_LIB_BASE QT.help.depends = network xml sql +QT.help.DEFINES = QT_HELP_LIB diff --git a/qttools/modules/qt_uitools.pri b/qttools/modules/qt_uitools.pri index 4de5d05..65a527e 100644 --- a/qttools/modules/qt_uitools.pri +++ b/qttools/modules/qt_uitools.pri @@ -9,3 +9,6 @@ QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools QT.uitools.libs = $$QT_MODULE_LIB_BASE QT.uitools.depends = xml +QT.uitools.DEFINES = QT_UITOOLS_LIB + +QT_CONFIG += uitools diff --git a/qtxmlpatterns/modules/qt_xmlpatterns.pri b/qtxmlpatterns/modules/qt_xmlpatterns.pri index d67a720..a5a50e6 100644 --- a/qtxmlpatterns/modules/qt_xmlpatterns.pri +++ b/qtxmlpatterns/modules/qt_xmlpatterns.pri @@ -9,3 +9,6 @@ QT.xmlpatterns.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns/private QT.xmlpatterns.sources = $$QT_MODULE_BASE/src/xmlpatterns QT.xmlpatterns.libs = $$QT_MODULE_LIB_BASE QT.xmlpatterns.depends = core network +QT.xmlpatterns.DEFINES = QT_XMLPATTERNS_LIB + +QT_CONFIG += xmlpatterns -- 1.7.5.rc2.4.g4d8b3