From 908badc6ac348891aefbd6ace2391eb00c60fbd4 Mon Sep 17 00:00:00 2001 From: Xizhi Zhu Date: Wed, 29 Jun 2011 15:13:58 +0300 Subject: [PATCH 1/6] Enable the build for QtSystems by default. --- qt.pro | 2 -- 1 file changed, 2 deletions(-) diff --git a/qt.pro b/qt.pro index 754bbec4..e569beb4 100644 --- a/qt.pro +++ b/qt.pro @@ -76,8 +76,6 @@ module_qtsensors.depends = module_qtbase module_qtdeclarative module_qtsystems.subdir = $$IN_PWD/qtsystems module_qtsystems.target = module-qtsystems module_qtsystems.depends = module_qtbase module_qtdeclarative -# not yet enabled by default -module_qtsystems.CONFIG = no_default_target no_default_install module_qtmultimediakit.subdir = $$IN_PWD/qtmultimediakit module_qtmultimediakit.target = module-qtmultimediakit From b034b3c4e48ee18d250245a5398e257442afea32 Mon Sep 17 00:00:00 2001 From: Xizhi Zhu Date: Wed, 29 Jun 2011 16:40:45 +0300 Subject: [PATCH 2/6] Update the head for qtsystems submodule. --- qtsystems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtsystems b/qtsystems index c0b5b3b6..b5534f83 160000 --- a/qtsystems +++ b/qtsystems @@ -1 +1 @@ -Subproject commit c0b5b3b6bb20f9b4abb2934c5cbd5a43f41d8b39 +Subproject commit b5534f832fd0c6c3845caf2b40858afcf048d14c From 4df43a509b9ceb5194bb0033f416302171b17e73 Mon Sep 17 00:00:00 2001 From: Xizhi Zhu Date: Wed, 29 Jun 2011 20:00:22 +0300 Subject: [PATCH 3/6] Update submodule reference to the latest. --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtphonon | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtsvg | 2 +- qttools | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 01d455e2..677e6b7c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 01d455e2019b31e1a3e90da499d37b135b7e699c +Subproject commit 677e6b7c889e67ac7ae7b7df66500f43bf80e89d diff --git a/qtbase b/qtbase index 1fb4d673..fa65123a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1fb4d6737c09a5d6e1bbcf135029cd0a7f2e72f6 +Subproject commit fa65123a86529bbbdaf2b774d741400a3dbfd593 diff --git a/qtdeclarative b/qtdeclarative index e789d98c..e41318cb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e789d98c03a8f235520667df6fd27fab9e66055d +Subproject commit e41318cbb9261e65ddc164cd1811cb911bd70153 diff --git a/qtdoc b/qtdoc index 7e58eff3..b95a67c0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7e58eff39b1a7c3e093128ee3726d97031a2f06d +Subproject commit b95a67c03b7e8d6b3d7298b961c85d99a0559bb9 diff --git a/qtlocation b/qtlocation index 1dd8b480..8acf30ad 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1dd8b4805d108931a41eb2d58874a598281ee2c4 +Subproject commit 8acf30adfa51aba4ee0f2fdd71c9c50e9c759a23 diff --git a/qtmultimedia b/qtmultimedia index d400cf2b..9d24cb54 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d400cf2b807761571424cf8d9051505d2b1c1178 +Subproject commit 9d24cb54d983d5f32481793f27d6cf7794b38592 diff --git a/qtphonon b/qtphonon index db5f6792..0b6ab62b 160000 --- a/qtphonon +++ b/qtphonon @@ -1 +1 @@ -Subproject commit db5f67926ebb5430cc75d00a8d39614c9ce5cda0 +Subproject commit 0b6ab62b87aaaf362c4ac33f568bd21488e75117 diff --git a/qtqa b/qtqa index 0316a4af..447e1ff9 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0316a4af9941ce4bb63ba5380777f75d4dea7c71 +Subproject commit 447e1ff970c64ba581ddca1a66d9737b5a2cd6c5 diff --git a/qtrepotools b/qtrepotools index 61dca1cf..b4dcc01a 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 61dca1cf8029c9ddcf71e81e149ace6bed49f510 +Subproject commit b4dcc01ace485c248aa2613954ca8cf1fc02700b diff --git a/qtscript b/qtscript index d9c4d635..9fef9f36 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit d9c4d635722d027c2b05cd54f1a44f3ebfdb29d0 +Subproject commit 9fef9f368f3a9522b81f4f1509decfb5f94461ae diff --git a/qtsensors b/qtsensors index bc72e142..1495f843 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit bc72e14225e7f03ae3134858e271463d560b760f +Subproject commit 1495f8434a7e18d256ab27d3f221ac6718ee162d diff --git a/qtsvg b/qtsvg index 8c19885e..0eebae5f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8c19885edf34ccf9de5de29288d28a00ca44933d +Subproject commit 0eebae5f2c1ff827ee5ce8748fa7cd677486d265 diff --git a/qttools b/qttools index 75b8fea0..41bacb22 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 75b8fea08278d5837a6a5e9289a7ce178216f654 +Subproject commit 41bacb22206d49a04de300fb34b0576a003343b2 diff --git a/qtxmlpatterns b/qtxmlpatterns index 6f9790b6..d2774208 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 6f9790b6dd5faff0f55d3316215e883ddcd8abfd +Subproject commit d2774208f371c612e32a7a5837257247305897c8 From 868c76dc4a3852e87214b8918a46bac51420cd4a Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 1 Jul 2011 11:16:25 +1000 Subject: [PATCH 4/6] Update qtwebkit (fix compile) --- qtwebkit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebkit b/qtwebkit index 5ed0c6a1..81b8dac1 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 5ed0c6a101104572d494d53cdfd65a0c8e6e01c0 +Subproject commit 81b8dac16049715b94dc36256bd9f433f7dfacc5 From b397b26b58c950afab585ec44e28fc5f9d318d08 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 1 Jul 2011 15:21:02 +1000 Subject: [PATCH 5/6] qtwebkit: force separate_debug_info off This feature does not currently work with webkit's custom build script, so disable it. --- qtwebkit.pri | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qtwebkit.pri b/qtwebkit.pri index af16a119..05665e0c 100644 --- a/qtwebkit.pri +++ b/qtwebkit.pri @@ -30,6 +30,11 @@ contains(DS, /) { GNUTOOLS = $$quote("set \"PATH=$$PWD/gnuwin32/bin;%PATH%\" &&") } +# Any configuration making use of QMAKE_POST_LINK will not work for this project, +# since the building is done by webkit's own build script and qmake at this level +# does not know the real TARGET. Disable them here. +CONFIG -= separate_debug_info + exists($$PWD/qtwebkit/WebKitTools):qtwebkit_tools_dir = WebKitTools else:qtwebkit_tools_dir = Tools From 0d814147eb1505fd77ada41ea9c6e3d1777ba2de Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Sat, 2 Jul 2011 14:17:04 +1000 Subject: [PATCH 6/6] Update qttools (fix compile) --- qttools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qttools b/qttools index 41bacb22..de73f13a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 41bacb22206d49a04de300fb34b0576a003343b2 +Subproject commit de73f13a2186a7ccce6b4fd69a018bd611b993ce