summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-07-12 08:44:12 (GMT)
committerSamuli Piippo <samuli.piippo@digia.com>2011-06-09 10:07:15 (GMT)
commitc1c5168be0d1a502207f84396e01f194273a11ae (patch)
tree4c02f22e20fa2cb6e6e3c4495783e4bec3ac1fec
parentefd076454343c3e02ce2c54f1605dba2a375a2b9 (diff)
downloadQt-c1c5168be0d1a502207f84396e01f194273a11ae.zip
Qt-c1c5168be0d1a502207f84396e01f194273a11ae.tar.gz
Qt-c1c5168be0d1a502207f84396e01f194273a11ae.tar.bz2
syncqt: fix wrong paths in include/ActiveQt/headers.pri
Assigning a semicolon separated list of directories to a Qt module does not work correctly. The values of %modules must be split into single values before operating on them. This doesn't happen in all places. ActiveQt is the only module where this feature is used. Also, it is not needed anymore for this particular module. Thus, I'll just remove the semicolon separated list from ActiveQt and replace it with the module directory. Task-number: QTBUG-4586 Reviewed-by: ossi (cherry picked from commit 29dcc069ba9a2c38b4461d5fd19d5fa9a1531595)
-rwxr-xr-xbin/syncqt2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/syncqt b/bin/syncqt
index db6dce6..4f8e343 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -42,7 +42,7 @@ my %modules = ( # path to module name map
"QtScript" => "$basedir/src/script",
"QtScriptTools" => "$basedir/src/scripttools",
"Qt3Support" => "$basedir/src/qt3support",
- "ActiveQt" => "$basedir/src/activeqt/container;$basedir/src/activeqt/control;$basedir/src/activeqt/shared",
+ "ActiveQt" => "$basedir/src/activeqt",
"QtTest" => "$basedir/src/testlib",
"QtAssistant" => "$basedir/tools/assistant/compat/lib",
"QtHelp" => "$basedir/tools/assistant/lib",