From 87b33b5c6750512443a2b9042bbd7328a112a528 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 16 Dec 2010 23:34:20 -0600 Subject: [PATCH] Add the source path to the modules .pri file --- qt3support/modules/qt_qt3support.pri | 1 + qtbase/bin/syncqt | 1 + 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_svg.pri | 1 + qtbase/src/modules/qt_testlib.pri | 1 + qtbase/src/modules/qt_xml.pri | 1 + qtdeclarative/modules/qt_declarative.pri | 1 + qtscript/modules/qt_script.pri | 1 + qtscript/modules/qt_scripttools.pri | 1 + qttools/modules/qt_help.pri | 1 + qtxmlpatterns/modules/qt_xmlpatterns.pri | 1 + 17 files changed, 17 insertions(+), 0 deletions(-) diff --git a/qt3support/modules/qt_qt3support.pri b/qt3support/modules/qt_qt3support.pri index 400b69c..86d6395 100644 --- a/qt3support/modules/qt_qt3support.pri +++ b/qt3support/modules/qt_qt3support.pri @@ -5,6 +5,7 @@ QT_QT3SUPPORT_PATCH_VERSION = $$QT_PATCH_VERSION QT.qt3support.name = Qt3Support QT.qt3support.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3Support +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 diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt index ac540ea..c3e28ec 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt @@ -1006,6 +1006,7 @@ foreach my $lib (@modules_to_sync) { my $modulepriname = basename($modulepri); my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname"; open MODULE_PRI_FILE, ">$moduleprifwd"; + print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n"; print MODULE_PRI_FILE "include($modulepri)\n"; diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri index e90011a..246fed7 100644 --- a/qtbase/src/modules/qt_core.pri +++ b/qtbase/src/modules/qt_core.pri @@ -5,5 +5,6 @@ QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION QT.core.name = QtCore QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore +QT.core.sources = $$QT_MODULE_BASE/src/corelib QT.core.libs = $$QT_MODULE_LIB_BASE QT.core.depends = diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri index b762353..e930949 100644 --- a/qtbase/src/modules/qt_dbus.pri +++ b/qtbase/src/modules/qt_dbus.pri @@ -5,6 +5,7 @@ QT_DBUS_PATCH_VERSION = $$QT_PATCH_VERSION QT.dbus.name = QtDBus QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus +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 diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri index f6b9720..0f5da2f 100644 --- a/qtbase/src/modules/qt_gui.pri +++ b/qtbase/src/modules/qt_gui.pri @@ -5,5 +5,6 @@ QT_GUI_PATCH_VERSION = $$QT_PATCH_VERSION QT.gui.name = QtGui QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui +QT.gui.sources = $$QT_MODULE_BASE/src/gui QT.gui.libs = $$QT_MODULE_LIB_BASE QT.gui.depends = core network diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri index d794b2e..4a9ae46 100644 --- a/qtbase/src/modules/qt_network.pri +++ b/qtbase/src/modules/qt_network.pri @@ -5,5 +5,6 @@ QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION QT.network.name = QtNetwork QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork +QT.network.sources = $$QT_MODULE_BASE/src/network QT.network.libs = $$QT_MODULE_LIB_BASE QT.network.depends = core diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri index 9eff7ef..71cfa2f 100644 --- a/qtbase/src/modules/qt_opengl.pri +++ b/qtbase/src/modules/qt_opengl.pri @@ -5,6 +5,7 @@ QT_OPENGL_PATCH_VERSION = $$QT_PATCH_VERSION QT.opengl.name = QtOpenGL QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL +QT.opengl.sources = $$QT_MODULE_BASE/src/opengl QT.opengl.libs = $$QT_MODULE_LIB_BASE QT.opengl.depends = core gui QT.opengl.CONFIG = opengl diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri index e9fa17f..bd50abb 100644 --- a/qtbase/src/modules/qt_openvg.pri +++ b/qtbase/src/modules/qt_openvg.pri @@ -5,6 +5,7 @@ QT_OPENVG_PATCH_VERSION = $$QT_PATCH_VERSION QT.openvg.name = QtOpenVG QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG +QT.openvg.sources = $$QT_MODULE_BASE/src/openvg QT.openvg.libs = $$QT_MODULE_LIB_BASE QT.openvg.depends = core gui QT.openvg.CONFIG = openvg diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri index 93cac45..4ec18f0 100644 --- a/qtbase/src/modules/qt_sql.pri +++ b/qtbase/src/modules/qt_sql.pri @@ -5,5 +5,6 @@ QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION QT.sql.name = QtSql QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql +QT.sql.sources = $$QT_MODULE_BASE/src/sql QT.sql.libs = $$QT_MODULE_LIB_BASE QT.sql.depends = core diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri index 27b4fb0..1be80f6 100644 --- a/qtbase/src/modules/qt_svg.pri +++ b/qtbase/src/modules/qt_svg.pri @@ -5,5 +5,6 @@ QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION QT.svg.name = QtSvg QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg +QT.svg.sources = $$QT_MODULE_BASE/src/svg QT.svg.libs = $$QT_MODULE_LIB_BASE QT.svg.depends = core gui diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri index 05db9db..ffca9f0 100644 --- a/qtbase/src/modules/qt_testlib.pri +++ b/qtbase/src/modules/qt_testlib.pri @@ -5,6 +5,7 @@ QT_TEST_PATCH_VERSION = $$QT_PATCH_VERSION QT.testlib.name = QtTest QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest +QT.testlib.sources = $$QT_MODULE_BASE/src/testlib QT.testlib.libs = $$QT_MODULE_LIB_BASE QT.testlib.depends = core QT.testlib.CONFIG = console diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri index 06fc5fc..4932ae5 100644 --- a/qtbase/src/modules/qt_xml.pri +++ b/qtbase/src/modules/qt_xml.pri @@ -5,5 +5,6 @@ QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION QT.xml.name = QtXml QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml +QT.xml.sources = $$QT_MODULE_BASE/src/xml QT.xml.libs = $$QT_MODULE_LIB_BASE QT.xml.depends = core diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri index 5fb8c25..1ddd14a 100644 --- a/qtdeclarative/modules/qt_declarative.pri +++ b/qtdeclarative/modules/qt_declarative.pri @@ -5,5 +5,6 @@ QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION QT.declarative.name = QtDeclarative QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative +QT.declarative.sources = $$QT_MODULE_BASE/src/declarative QT.declarative.libs = $$QT_MODULE_LIB_BASE QT.declarative.depends = gui script network diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri index d0dcd2d..f44224d 100644 --- a/qtscript/modules/qt_script.pri +++ b/qtscript/modules/qt_script.pri @@ -5,5 +5,6 @@ QT_SCRIPT_PATCH_VERSION = $$QT_PATCH_VERSION QT.script.name = QtScript QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript +QT.script.sources = $$QT_MODULE_BASE/src/script QT.script.libs = $$QT_MODULE_LIB_BASE QT.script.depends = core diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri index a39e22a..124a930 100644 --- a/qtscript/modules/qt_scripttools.pri +++ b/qtscript/modules/qt_scripttools.pri @@ -5,5 +5,6 @@ QT_SCRIPTTOOLS_PATCH_VERSION = $$QT_PATCH_VERSION QT.scripttools.name = QtScriptTools QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScriptTools +QT.scripttools.sources = $$QT_MODULE_BASE/src/scripttools QT.scripttools.libs = $$QT_MODULE_LIB_BASE QT.scripttools.depends = script gui network diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri index a0028ff..8812d5e 100644 --- a/qttools/modules/qt_help.pri +++ b/qttools/modules/qt_help.pri @@ -5,5 +5,6 @@ QT_HELP_PATCH_VERSION = $$QT_PATCH_VERSION QT.help.name = QtHelp QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp +QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib QT.help.libs = $$QT_MODULE_LIB_BASE QT.help.depends = network xml sql diff --git a/qtxmlpatterns/modules/qt_xmlpatterns.pri b/qtxmlpatterns/modules/qt_xmlpatterns.pri index ac83022..a11c06a 100644 --- a/qtxmlpatterns/modules/qt_xmlpatterns.pri +++ b/qtxmlpatterns/modules/qt_xmlpatterns.pri @@ -5,5 +5,6 @@ QT_XMLPATTERNS_PATCH_VERSION = $$QT_PATCH_VERSION QT.xmlpatterns.name = QtXmlPatterns QT.xmlpatterns.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns +QT.xmlpatterns.sources = $$QT_MODULE_BASE/src/xmlpatterns QT.xmlpatterns.libs = $$QT_MODULE_LIB_BASE QT.xmlpatterns.depends = core network -- 1.7.3.4