From: Marius Storm-Olsen Date: Fri, 17 Dec 2010 05:34:20 +0000 (-0600) Subject: Add the source path to the modules .pri file X-Git-Tag: qt-v5.0.0-alpha1~4403 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=997f87bfcf1e15dd63a4543f354972ab7bd49eba;p=profile%2Fivi%2Fqtbase.git Add the source path to the modules .pri file --- diff --git a/bin/syncqt b/bin/syncqt index ac540ea..c3e28ec 100755 --- a/bin/syncqt +++ b/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/src/modules/qt_core.pri b/src/modules/qt_core.pri index e90011a..246fed7 100644 --- a/src/modules/qt_core.pri +++ b/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/src/modules/qt_dbus.pri b/src/modules/qt_dbus.pri index b762353..e930949 100644 --- a/src/modules/qt_dbus.pri +++ b/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/src/modules/qt_gui.pri b/src/modules/qt_gui.pri index f6b9720..0f5da2f 100644 --- a/src/modules/qt_gui.pri +++ b/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/src/modules/qt_network.pri b/src/modules/qt_network.pri index d794b2e..4a9ae46 100644 --- a/src/modules/qt_network.pri +++ b/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/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri index 9eff7ef..71cfa2f 100644 --- a/src/modules/qt_opengl.pri +++ b/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/src/modules/qt_openvg.pri b/src/modules/qt_openvg.pri index e9fa17f..bd50abb 100644 --- a/src/modules/qt_openvg.pri +++ b/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/src/modules/qt_sql.pri b/src/modules/qt_sql.pri index 93cac45..4ec18f0 100644 --- a/src/modules/qt_sql.pri +++ b/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/src/modules/qt_svg.pri b/src/modules/qt_svg.pri index 27b4fb0..1be80f6 100644 --- a/src/modules/qt_svg.pri +++ b/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/src/modules/qt_testlib.pri b/src/modules/qt_testlib.pri index 05db9db..ffca9f0 100644 --- a/src/modules/qt_testlib.pri +++ b/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/src/modules/qt_xml.pri b/src/modules/qt_xml.pri index 06fc5fc..4932ae5 100644 --- a/src/modules/qt_xml.pri +++ b/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