summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/syncqt1
-rw-r--r--mkspecs/features/qt_config.prf1
-rw-r--r--src/modules/qt_core.pri1
-rw-r--r--src/modules/qt_dbus.pri1
-rw-r--r--src/modules/qt_network.pri1
-rw-r--r--src/modules/qt_opengl.pri1
-rw-r--r--src/modules/qt_openvg.pri1
-rw-r--r--src/modules/qt_sql.pri1
-rw-r--r--src/modules/qt_testlib.pri1
-rw-r--r--src/modules/qt_uilib.pri1
-rw-r--r--src/modules/qt_uitools.pri1
-rw-r--r--src/modules/qt_xml.pri1
12 files changed, 12 insertions, 0 deletions
diff --git a/bin/syncqt b/bin/syncqt
index e6ef527b91..d7dbc23204 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -1011,6 +1011,7 @@ foreach my $lib (@modules_to_sync) {
print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n";
print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $out_basedir/bin\n";
print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n";
+ print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtbasedir/imports\n";
print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n";
print MODULE_PRI_FILE "include($modulepri)\n";
close MODULE_PRI_FILE;
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 7e80ad38e8..0be4dee4ca 100644
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -21,6 +21,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS]
QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS]
QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS]
+ QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS]
include($$mod)
}
}
diff --git a/src/modules/qt_core.pri b/src/modules/qt_core.pri
index 99f3fa6145..dc2ca54805 100644
--- a/src/modules/qt_core.pri
+++ b/src/modules/qt_core.pri
@@ -9,5 +9,6 @@ QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore
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.imports = $$QT_MODULE_IMPORT_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 74949b15f7..7d3b7f367f 100644
--- a/src/modules/qt_dbus.pri
+++ b/src/modules/qt_dbus.pri
@@ -9,6 +9,7 @@ QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus
QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/private
QT.dbus.sources = $$QT_MODULE_BASE/src/dbus
QT.dbus.libs = $$QT_MODULE_LIB_BASE
+QT.dbus.imports = $$QT_MODULE_IMPORT_BASE
QT.dbus.depends = core xml
QT.dbus.CONFIG = dbusadaptors dbusinterfaces
QT.dbus.DEFINES = QT_DBUS_LIB
diff --git a/src/modules/qt_network.pri b/src/modules/qt_network.pri
index 37c941b823..f9474bb36a 100644
--- a/src/modules/qt_network.pri
+++ b/src/modules/qt_network.pri
@@ -9,5 +9,6 @@ QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork
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.imports = $$QT_MODULE_IMPORT_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 0bd0df7fe6..a54c384377 100644
--- a/src/modules/qt_opengl.pri
+++ b/src/modules/qt_opengl.pri
@@ -9,6 +9,7 @@ QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL
QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/private
QT.opengl.sources = $$QT_MODULE_BASE/src/opengl
QT.opengl.libs = $$QT_MODULE_LIB_BASE
+QT.opengl.imports = $$QT_MODULE_IMPORT_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 9a3ef8b97b..19a9a81dab 100644
--- a/src/modules/qt_openvg.pri
+++ b/src/modules/qt_openvg.pri
@@ -9,6 +9,7 @@ QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG
QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/private
QT.openvg.sources = $$QT_MODULE_BASE/src/openvg
QT.openvg.libs = $$QT_MODULE_LIB_BASE
+QT.openvg.imports = $$QT_MODULE_IMPORT_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 d9b856e18c..c3950b1691 100644
--- a/src/modules/qt_sql.pri
+++ b/src/modules/qt_sql.pri
@@ -9,5 +9,6 @@ QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql
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.imports = $$QT_MODULE_IMPORT_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 7e9ca09b17..a4f5dd2b01 100644
--- a/src/modules/qt_testlib.pri
+++ b/src/modules/qt_testlib.pri
@@ -9,6 +9,7 @@ QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest
QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/private
QT.testlib.sources = $$QT_MODULE_BASE/src/testlib
QT.testlib.libs = $$QT_MODULE_LIB_BASE
+QT.testlib.imports = $$QT_MODULE_IMPORT_BASE
QT.testlib.depends = core
QT.testlib.CONFIG = console
QT.testlib.DEFINES = QT_TESTLIB_LIB
diff --git a/src/modules/qt_uilib.pri b/src/modules/qt_uilib.pri
index 0e143de6c9..d1bd19a522 100644
--- a/src/modules/qt_uilib.pri
+++ b/src/modules/qt_uilib.pri
@@ -9,4 +9,5 @@ QT.uilib.includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner
QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private
QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib
QT.uilib.libs = $$QT_MODULE_LIB_BASE
+QT.uilib.imports = $$QT_MODULE_IMPORT_BASE
QT.uilib.depends = xml
diff --git a/src/modules/qt_uitools.pri b/src/modules/qt_uitools.pri
index 1f4070c22d..5b71e27f7a 100644
--- a/src/modules/qt_uitools.pri
+++ b/src/modules/qt_uitools.pri
@@ -9,6 +9,7 @@ QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools
QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private
QT.uitools.sources = $$QT_MODULE_BASE/src/uitools
QT.uitools.libs = $$QT_MODULE_LIB_BASE
+QT.uitools.imports = $$QT_MODULE_IMPORT_BASE
QT.uitools.depends = xml
QT.uitools.DEFINES = QT_UITOOLS_LIB
diff --git a/src/modules/qt_xml.pri b/src/modules/qt_xml.pri
index c967cd7c4b..95d9467969 100644
--- a/src/modules/qt_xml.pri
+++ b/src/modules/qt_xml.pri
@@ -9,5 +9,6 @@ QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml
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.imports = $$QT_MODULE_IMPORT_BASE
QT.xml.depends = core
QT.xml.DEFINES = QT_XML_LIB