From 008943132609e1a92e500decf391bc75da320d2f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Feb 2013 10:39:57 +0100 Subject: [PATCH 01/19] don't make webkit build conditional on ICU webkit now contains its own configure magic to disable itself. Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855 Reviewed-by: Simon Hausmann --- qt.pro | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/qt.pro b/qt.pro index bcf2f6af..0d118de0 100644 --- a/qt.pro +++ b/qt.pro @@ -106,15 +106,11 @@ exists(qtactiveqt/qtactiveqt.pro) { module_qttools.depends += module_qtactiveqt } exists(qtwebkit/WebKit.pro) { - mac|contains(QT_CONFIG, icu) { - SUBDIRS += module_qtwebkit - module_qttools.depends += module_qtwebkit - module_qtquick1.depends += module_qtwebkit - exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) { - SUBDIRS += module_qtwebkit_examples_and_demos - } - } else { - message("WebKit: Qt was built without ICU support, WebKit disabled.") + SUBDIRS += module_qtwebkit + module_qttools.depends += module_qtwebkit + module_qtquick1.depends += module_qtwebkit + exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) { + SUBDIRS += module_qtwebkit_examples_and_demos } } exists(qttools/qttools.pro) { From aeed8ce504b47985ef317f2cfcd6f715916303fb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Feb 2013 10:33:49 +0100 Subject: [PATCH 02/19] semi-automate adding submodules this way adding a module actually becomes a one-liner Change-Id: Ie31039d36e948094c3ec241758eaab330304b194 Reviewed-by: Simon Hausmann --- qt.pro | 157 ++++++++++++++++++--------------------------------------- 1 file changed, 49 insertions(+), 108 deletions(-) diff --git a/qt.pro b/qt.pro index 0d118de0..9614e433 100644 --- a/qt.pro +++ b/qt.pro @@ -5,121 +5,62 @@ TEMPLATE = subdirs CONFIG += prepare_docs qt_docs_targets testcase_targets -module_qtbase.subdir = qtbase -module_qtbase.target = module-qtbase +defineReplace(moduleName) { + return(module_$$replace(1, -, _)) +} -module_qtsvg.subdir = qtsvg -module_qtsvg.target = module-qtsvg -module_qtsvg.depends = module_qtbase +# Arguments: module name, [mandatory deps], [optional deps], [project file] +defineTest(addModule) { + mod = $$moduleName($$1) -module_qtxmlpatterns.subdir = qtxmlpatterns -module_qtxmlpatterns.target = module-qtxmlpatterns -module_qtxmlpatterns.depends = module_qtbase + isEmpty(4) { + !exists($$1/$${1}.pro): return(false) + $${mod}.subdir = $$1 + export($${mod}.subdir) + } else { + !exists($$1/$${4}): return(false) + $${mod}.file = $$1/$$4 + $${mod}.makefile = Makefile + export($${mod}.file) + export($${mod}.makefile) + } -module_qtscript.subdir = qtscript -module_qtscript.target = module-qtscript -module_qtscript.depends = module_qtbase + for(d, 2): \ + $${mod}.depends += $$moduleName($$d) + for(d, 3) { + dn = $$moduleName($$d) + contains(SUBDIRS, $$dn): \ + $${mod}.depends += $$dn + } + !isEmpty($${mod}.depends): \ + export($${mod}.depends) -module_qtjsbackend.subdir = qtjsbackend -module_qtjsbackend.target = module-qtjsbackend -module_qtjsbackend.depends = module_qtbase + $${mod}.target = module-$$1 + export($${mod}.target) -module_qtdeclarative.subdir = qtdeclarative -module_qtdeclarative.target = module-qtdeclarative -module_qtdeclarative.depends = module_qtbase module_qtjsbackend - -module_qtwebkit.file = qtwebkit/WebKit.pro -module_qtwebkit.makefile = Makefile -module_qtwebkit.depends = module_qtbase module_qtdeclarative -module_qtwebkit.target = module-qtwebkit - -module_qtwebkit_examples_and_demos.subdir = qtwebkit-examples-and-demos -module_qtwebkit_examples_and_demos.target = module-qtwebkit-examples-and-demos -module_qtwebkit_examples_and_demos.depends = module_qtwebkit module_qttools - -module_qttools.subdir = qttools -module_qttools.target = module-qttools -module_qttools.depends = module_qtbase - -module_qttranslations.subdir = qttranslations -module_qttranslations.target = module-qttranslations -module_qttranslations.depends = module_qttools - -module_qtdoc.subdir = qtdoc -module_qtdoc.target = module-qtdoc -module_qtdoc.depends = module_qtbase module_qtdeclarative - -module_qtactiveqt.subdir = qtactiveqt -module_qtactiveqt.target = module-qtactiveqt -module_qtactiveqt.depends = module_qtbase - -module_qtqa.subdir = qtqa -module_qtqa.target = module-qtqa -module_qtqa.depends = module_qtbase - -module_qtmultimedia.subdir = qtmultimedia -module_qtmultimedia.target = module-qtmultimedia -module_qtmultimedia.depends = module_qtbase - -module_qtimageformats.subdir = qtimageformats -module_qtimageformats.target = module-qtimageformats -module_qtimageformats.depends = module_qtbase - -module_qtquick1.subdir = qtquick1 -module_qtquick1.target = module-qtquick1 -module_qtquick1.depends = module_qtbase module_qtscript - -module_qtgraphicaleffects.subdir = qtgraphicaleffects -module_qtgraphicaleffects.target = module-qtgraphicaleffects -module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative + SUBDIRS += $$mod + export(SUBDIRS) + return(true) +} # only qtbase is required to exist. The others may not - but it is the # users responsibility to ensure that all needed dependencies exist, or # it may not build. -SUBDIRS = module_qtbase - -exists(qtsvg/qtsvg.pro) { - SUBDIRS += module_qtsvg - # These modules do not require qtsvg, but can use it if it is available - module_qtdeclarative.depends += module_qtsvg - module_qtquick1.depends += module_qtsvg -} -exists(qtxmlpatterns/qtxmlpatterns.pro) { - SUBDIRS += module_qtxmlpatterns - # These modules do not require qtxmlpatterns, but can use it if it is available - module_qtdeclarative.depends += module_qtxmlpatterns - module_qtquick1.depends += module_qtxmlpatterns -} - -exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend -exists(qtdeclarative/qtdeclarative.pro) { - SUBDIRS += module_qtdeclarative - # These modules do not require qtdeclarative, but can use it if it is available - module_qttools.depends += module_qtdeclarative - module_qtmultimedia.depends += module_qtdeclarative -} -exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript -exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia -exists(qtactiveqt/qtactiveqt.pro) { - SUBDIRS += module_qtactiveqt - module_qttools.depends += module_qtactiveqt -} -exists(qtwebkit/WebKit.pro) { - SUBDIRS += module_qtwebkit - module_qttools.depends += module_qtwebkit - module_qtquick1.depends += module_qtwebkit - exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) { - SUBDIRS += module_qtwebkit_examples_and_demos - } -} -exists(qttools/qttools.pro) { - SUBDIRS += module_qttools - module_qtquick1.depends += module_qttools -} -exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1 -exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats -exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects -exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations -exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc -exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa +addModule(qtbase) +addModule(qtsvg, qtbase) +addModule(qtxmlpatterns, qtbase) +addModule(qtjsbackend, qtbase) +addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns) +addModule(qtmultimedia, qtbase, qtdeclarative) +addModule(qtactiveqt, qtbase) +addModule(qtwebkit, qtdeclarative, , WebKit.pro) +addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) +addModule(qtwebkit-examples-and-demos, qtwebkit qttools) +addModule(qtimageformats, qtbase) +addModule(qtgraphicaleffects, qtdeclarative) +addModule(qtscript, qtbase) +addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) +addModule(qttranslations, qttools) +addModule(qtdoc, qtdeclarative) +addModule(qtqa, qtbase) From 08ec2c7a620de84591552b57e396fe3fd404418c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Feb 2013 10:36:36 +0100 Subject: [PATCH 03/19] make it possible to explicitly exclude particular modules Task-number: QTBUG-26697 Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f Reviewed-by: Simon Hausmann --- qt.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qt.pro b/qt.pro index 9614e433..91151678 100644 --- a/qt.pro +++ b/qt.pro @@ -1,9 +1,10 @@ # Create the super cache so modules will add themselves to it. cache(, super) -TEMPLATE = subdirs +CONFIG += build_pass # hack to disable the .qmake.super auto-add +load(qt_build_config) -CONFIG += prepare_docs qt_docs_targets testcase_targets +TEMPLATE = subdirs defineReplace(moduleName) { return(module_$$replace(1, -, _)) @@ -11,6 +12,7 @@ defineReplace(moduleName) { # Arguments: module name, [mandatory deps], [optional deps], [project file] defineTest(addModule) { + contains(QT_SKIP_MODULES, $$1): return(false) mod = $$moduleName($$1) isEmpty(4) { From 2ef82978ca338dcf6f46e8f1f1ebf7bcdd51c51c Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Fri, 22 Feb 2013 07:51:57 +0000 Subject: [PATCH 04/19] README: Update with the reference platforms and remove the mingw entry Change-Id: I1e43a52dc31c1103c91f61e423c6850697bc3540 Reviewed-by: Friedemann Kleint Reviewed-by: Kai Koehne --- README | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README b/README index 392d7eb2..06b57840 100644 --- a/README +++ b/README @@ -59,9 +59,6 @@ HOW TO BUILD QT5 configure -prefix %CD%\qtbase -opensource -nomake tests nmake // jom // mingw32-make - For MinGW (gcc version 4.6 or later), ensure that the compiler can - be found in the path. - To accelerate the bootstrap of qmake with MSVC, it may be useful to pass "-make-tool jom" on the configure command line. If you do not use jom, adding "/MP" to the CL environment variable is a good idea. @@ -124,3 +121,4 @@ HOW TO BUILD QT5 ===================== See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git for more information. + See http://qt-project.org/wiki/Qt-5 for the reference platforms. From d3d46ac7b315145cfce399450e5f99a2c16dd41b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 27 Feb 2013 19:36:29 +0200 Subject: [PATCH 05/19] Updated submodules. Change-Id: I3d960ec9a9f11da295f603ca6fbfe80ee3681ae9 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtjsbackend | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- qtwebkit-examples-and-demos | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index b5366d0f..7f394bc7 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b5366d0fa77bf219a26023a463c1b8045c7d306f +Subproject commit 7f394bc7c4c61289885101f4d349a0bf573ac11d diff --git a/qtbase b/qtbase index e17dddfd..cd1e2458 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e17dddfd3bcc09a9ae919a1650107c8cd3a75d08 +Subproject commit cd1e24587709d09c22256dede900629743cf6b6b diff --git a/qtdeclarative b/qtdeclarative index 7c5b2e93..fd9d0ea8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7c5b2e93a0f61e2fbc3d554b97e23009e22b68bc +Subproject commit fd9d0ea8803630c1375ab897c4df6c65eaa4fd31 diff --git a/qtdoc b/qtdoc index e7435af2..dec72906 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e7435af29366e979411130a1aa38179eda5269bc +Subproject commit dec729066c60d99469a61f012e1fdcefdeab217e diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 1444a08b..5717e881 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 1444a08b7e16a09f056f3bed24cf843d29874cba +Subproject commit 5717e881ae7246e3ab2e1df12af73378ebaad824 diff --git a/qtimageformats b/qtimageformats index 9e7c3f09..c8f12586 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9e7c3f09b1cf2e4645efd7aa25f69c299f880787 +Subproject commit c8f1258628657baca02bf0c6b84a4bbfb08251e4 diff --git a/qtjsbackend b/qtjsbackend index ce0de181..cbd9ec0d 160000 --- a/qtjsbackend +++ b/qtjsbackend @@ -1 +1 @@ -Subproject commit ce0de1819ac3aad1d7da9e7bcfd99331fcc23dd7 +Subproject commit cbd9ec0defc2558d32ddfd44fe22c1af9c7a36e7 diff --git a/qtmultimedia b/qtmultimedia index 02fb5bea..339fda0c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 02fb5bea9bb0828a9f56989f6e48835eddd3310d +Subproject commit 339fda0ca9d622f3525b58e91dbf78f65b44bcc2 diff --git a/qtqa b/qtqa index b2221fac..f9cac362 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b2221faca328d173e4cb91b75a4cce90cb5568dd +Subproject commit f9cac362577be6d40d0a361fdf6ee383dc7812c9 diff --git a/qtquick1 b/qtquick1 index 0cd72c52..c520a69f 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 0cd72c52ca5e5b21adbd47d0f551535e727b80ee +Subproject commit c520a69f06317fb90d37324bf284ef9614cb5dbf diff --git a/qtrepotools b/qtrepotools index ef4f1434..6a672270 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ef4f1434841acb955ecf586b168e83f70d4e9e1c +Subproject commit 6a672270cc3300606099b17d96ee94a0859bf567 diff --git a/qtscript b/qtscript index aaddb67d..4a35846c 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit aaddb67d074dcf1965e6c07a7232dd688deac416 +Subproject commit 4a35846cb643a1f94db6ea820d15250fc690ea07 diff --git a/qtsvg b/qtsvg index 8ce0f65e..204dc6d2 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8ce0f65e1abf3b0b9a1684dac3a32cd0b03ffc3c +Subproject commit 204dc6d2f6c2e0737dd0905577bc16a0f8ddf339 diff --git a/qttools b/qttools index 9b0b4e79..2c39ede6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9b0b4e799aadde36521acff0dc3439b4eae51877 +Subproject commit 2c39ede6b0efdb3b8dfbd6812ce1e013ba310eac diff --git a/qttranslations b/qttranslations index ab38e82f..3864fb8c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ab38e82f91eba27f6343e86d9b4aca96f72322af +Subproject commit 3864fb8cd69773adaec9b9364ac7ad85a439407b diff --git a/qtwebkit b/qtwebkit index 70c60ffc..836b2f65 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 70c60ffc8530221d54e0b3f5d9b8687cd3eff875 +Subproject commit 836b2f659d55b8197970adeeb0515a5a37293e84 diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos index 1faaf0d1..ee74b8c8 160000 --- a/qtwebkit-examples-and-demos +++ b/qtwebkit-examples-and-demos @@ -1 +1 @@ -Subproject commit 1faaf0d1e580b158971fd21c9881676ae5e7ed1e +Subproject commit ee74b8c84b9f435ede3bf81d1de4508dad088546 diff --git a/qtxmlpatterns b/qtxmlpatterns index c3c83eb1..de349a57 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit c3c83eb164c3932a311ad47ef0e1991d0bdc6c0e +Subproject commit de349a576481ed05756e90d7022ddf0d1aaf49b7 From 2f8a096c9cf722978f7995097fd2807445898f58 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 27 Mar 2013 16:51:02 +0200 Subject: [PATCH 06/19] Updated submodules. Change-Id: Id3d46ac7b315145cfce399450e5f99a2c16dd41b Reviewed-by: Sergio Ahumada --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtjsbackend | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- qtwebkit-examples-and-demos | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 7f394bc7..b8169e05 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7f394bc7c4c61289885101f4d349a0bf573ac11d +Subproject commit b8169e058a10e44abacd3dd6f3a4432bfdf151e8 diff --git a/qtbase b/qtbase index cd1e2458..a3f74835 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cd1e24587709d09c22256dede900629743cf6b6b +Subproject commit a3f74835f85c6524c648851454e961bd9cfb9d3f diff --git a/qtdeclarative b/qtdeclarative index fd9d0ea8..f7ada9b9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fd9d0ea8803630c1375ab897c4df6c65eaa4fd31 +Subproject commit f7ada9b9325c7adc10da6a3a4e7f887452682260 diff --git a/qtdoc b/qtdoc index dec72906..aa5cfcd9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dec729066c60d99469a61f012e1fdcefdeab217e +Subproject commit aa5cfcd91e7c8b4031e9e61151eee7c0fae4af6b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 5717e881..23a1dc28 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 5717e881ae7246e3ab2e1df12af73378ebaad824 +Subproject commit 23a1dc28177638fdf64a8accad52dc4dd7e5ba2a diff --git a/qtimageformats b/qtimageformats index c8f12586..50731469 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c8f1258628657baca02bf0c6b84a4bbfb08251e4 +Subproject commit 50731469be7b7c0ed18768789604e13955a8b2f7 diff --git a/qtjsbackend b/qtjsbackend index cbd9ec0d..c97afb08 160000 --- a/qtjsbackend +++ b/qtjsbackend @@ -1 +1 @@ -Subproject commit cbd9ec0defc2558d32ddfd44fe22c1af9c7a36e7 +Subproject commit c97afb08eb28ce36f726fe427556622790a287c1 diff --git a/qtmultimedia b/qtmultimedia index 339fda0c..570f05c2 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 339fda0ca9d622f3525b58e91dbf78f65b44bcc2 +Subproject commit 570f05c2d3ca05ac0955940b6b06fb2b3c015e6a diff --git a/qtqa b/qtqa index f9cac362..e7115f55 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f9cac362577be6d40d0a361fdf6ee383dc7812c9 +Subproject commit e7115f55a8d7d621da46654030a72ca7ae144b56 diff --git a/qtquick1 b/qtquick1 index c520a69f..3eb583f6 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit c520a69f06317fb90d37324bf284ef9614cb5dbf +Subproject commit 3eb583f6e6e0075583aea7dbf46cf3cec48cb879 diff --git a/qtrepotools b/qtrepotools index 6a672270..5453e0fb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 6a672270cc3300606099b17d96ee94a0859bf567 +Subproject commit 5453e0fb3133cd2e0a10d2b056f5873343a42e6d diff --git a/qtscript b/qtscript index 4a35846c..a5116f19 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 4a35846cb643a1f94db6ea820d15250fc690ea07 +Subproject commit a5116f19e540387fe0653364bbbd9a662bc67b7a diff --git a/qtsvg b/qtsvg index 204dc6d2..9c79ef00 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 204dc6d2f6c2e0737dd0905577bc16a0f8ddf339 +Subproject commit 9c79ef0046c550614964afb8feb734c96853691c diff --git a/qttools b/qttools index 2c39ede6..c216d3ce 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2c39ede6b0efdb3b8dfbd6812ce1e013ba310eac +Subproject commit c216d3ced546dd160005912c90694a07b4626942 diff --git a/qttranslations b/qttranslations index 3864fb8c..4e896d9e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 3864fb8cd69773adaec9b9364ac7ad85a439407b +Subproject commit 4e896d9ed32af523e8fb951409bf3cc21b4d5718 diff --git a/qtwebkit b/qtwebkit index 836b2f65..2a43c884 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 836b2f659d55b8197970adeeb0515a5a37293e84 +Subproject commit 2a43c884303d7a002f6e164aaa5bb7b301425563 diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos index ee74b8c8..08118e86 160000 --- a/qtwebkit-examples-and-demos +++ b/qtwebkit-examples-and-demos @@ -1 +1 @@ -Subproject commit ee74b8c84b9f435ede3bf81d1de4508dad088546 +Subproject commit 08118e862731b5ce91368d326a04b4a565e7f483 diff --git a/qtxmlpatterns b/qtxmlpatterns index de349a57..18d558b4 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit de349a576481ed05756e90d7022ddf0d1aaf49b7 +Subproject commit 18d558b4ab505724d0bd93b5f66997c33a601e04 From ec783bb21e0524d575adaf1d7a36811055c9fe5d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 2 Nov 2012 20:59:30 +0100 Subject: [PATCH 07/19] clone only a specific subset of repositories by default the list corresponds to the current contents of .gitmodules. this will allow us to re-add more modules to the supermodule without bothering people and the qt5 integration with unmaintained modules. Change-Id: I8bc429fed8e4d1f729b375b302531472d3c4e267 Reviewed-by: Sergio Ahumada --- init-repository | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/init-repository b/init-repository index 8cbdc80e..bd9fa038 100755 --- a/init-repository +++ b/init-repository @@ -91,6 +91,8 @@ git repository. Only initialize the specified subset of modules given as the argument. Specified modules must already exist in .gitmodules. +The string "all" results in cloning all known modules. The default is the set of +maintained modules. =item --no-update @@ -239,6 +241,27 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtxmlpatterns ); +my @DEFAULT_REPOS = qw( + qtactiveqt + qtbase + qtdeclarative + qtdoc + qtgraphicaleffects + qtimageformats + qtjsbackend + qtmultimedia + qtqa + qtquick1 + qtrepotools + qtscript + qtsvg + qttools + qttranslations + qtwebkit + qtwebkit-examples-and-demos + qtxmlpatterns +); + my $GERRIT_SSH_BASE = 'ssh://@USER@codereview.qt-project.org@PORT@/'; @@ -287,7 +310,7 @@ sub parse_arguments 'protocol' => "", 'update' => 1 , 'webkit' => 1 , - 'module-subset' => "", + 'module-subset' => join(",", @DEFAULT_REPOS), ); GetOptionsFromArray(\@args, @@ -328,7 +351,9 @@ sub parse_arguments # Replace any double trailing slashes from end of mirror $self->{'mirror-url'} =~ s{//+$}{/}; - if ($self->{'module-subset'}) { + if ($self->{'module-subset'} eq "all") { + $self->{'module-subset'} = ""; + } else { $self->{'module-subset'} = { map { $_ => 1 } split(qr{,}, $self->{'module-subset'}) }; From 66ed87fc6792a285430e88d8a9de496a532df8d8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 14:07:32 +0100 Subject: [PATCH 08/19] re-add a bunch of modules this allows for easy cloning and build system maintenance also for modules which are currently irrelevant, thus hopefully keeping the barrier to their revival low. it does not affect the casual developer or the CI system, as init-repository will not clone these modules. This (abstractly) reverts commits 41c3f2cb5f633f0e540482ca01b2c2caa2475e57, 725a51b1d83626e16989804707356baa909c339f and 1117d4da2caf1989f63ca0a8073a799df80428bc. Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094 Reviewed-by: Sergio Ahumada --- .gitmodules | 33 +++++++++++++++++++++++++++++++++ init-repository | 2 ++ qlalr | 1 + qt.pro | 15 +++++++++++++-- qt3d | 1 + qtconnectivity | 1 + qtdocgallery | 1 + qtfeedback | 1 + qtjsondb | 1 + qtlocation | 1 + qtpim | 1 + qtsensors | 1 + qtsystems | 1 + qtwayland | 1 + 14 files changed, 59 insertions(+), 2 deletions(-) create mode 160000 qlalr create mode 160000 qt3d create mode 160000 qtconnectivity create mode 160000 qtdocgallery create mode 160000 qtfeedback create mode 160000 qtjsondb create mode 160000 qtlocation create mode 160000 qtpim create mode 160000 qtsensors create mode 160000 qtsystems create mode 160000 qtwayland diff --git a/.gitmodules b/.gitmodules index 4f09c921..7d1c81e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,6 +28,9 @@ [submodule "qtdoc"] path = qtdoc url = git://gitorious.org/qt/qtdoc.git +[submodule "qlalr"] + path = qlalr + url = git://gitorious.org/qt/qlalr.git [submodule "qtrepotools"] path = qtrepotools url = git://gitorious.org/qt/qtrepotools.git @@ -40,6 +43,36 @@ [submodule "qtqa"] path = qtqa url = git://gitorious.org/qt/qtqa.git +[submodule "qtlocation"] + path = qtlocation + url = git://gitorious.org/qt/qtlocation.git +[submodule "qtsensors"] + path = qtsensors + url = git://gitorious.org/qt/qtsensors.git +[submodule "qtsystems"] + path = qtsystems + url = git://gitorious.org/qt/qtsystems.git +[submodule "qtfeedback"] + path = qtfeedback + url = git://gitorious.org/qt/qtfeedback.git +[submodule "qtdocgallery"] + path = qtdocgallery + url = git://gitorious.org/qt/qtdocgallery.git +[submodule "qtpim"] + path = qtpim + url = git://gitorious.org/qt/qtpim.git +[submodule "qtconnectivity"] + path = qtconnectivity + url = git://gitorious.org/qt/qtconnectivity.git +[submodule "qtwayland"] + path = qtwayland + url = git://gitorious.org/qt/qtwayland.git +[submodule "qtjsondb"] + path = qtjsondb + url = git://gitorious.org/qt/qtjsondb.git +[submodule "qt3d"] + path = qt3d + url = git://gitorious.org/qt/qt3d.git [submodule "qtjsbackend"] path = qtjsbackend url = git://gitorious.org/qt/qtjsbackend.git diff --git a/init-repository b/init-repository index bd9fa038..a89abbff 100755 --- a/init-repository +++ b/init-repository @@ -219,9 +219,11 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtconnectivity qtdeclarative qtdoc + qtdocgallery qtfeedback qtgraphicaleffects qtimageformats + qtjsondb qtjsbackend qtlocation qtmultimedia diff --git a/qlalr b/qlalr new file mode 160000 index 00000000..d7064c2c --- /dev/null +++ b/qlalr @@ -0,0 +1 @@ +Subproject commit d7064c2c7dfb36646811d2aefd097a8de9419894 diff --git a/qt.pro b/qt.pro index 91151678..7d1a78b8 100644 --- a/qt.pro +++ b/qt.pro @@ -50,19 +50,30 @@ defineTest(addModule) { # it may not build. addModule(qtbase) +addModule(qlalr, qtbase) addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtjsbackend, qtbase) addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns) -addModule(qtmultimedia, qtbase, qtdeclarative) +addModule(qtmultimedia, qtdeclarative) addModule(qtactiveqt, qtbase) -addModule(qtwebkit, qtdeclarative, , WebKit.pro) +addModule(qt3d, qtdeclarative) +addModule(qtjsondb, qtdeclarative) +addModule(qtsystems, qtbase, qtdeclarative qtjsondb) +addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia) +addModule(qtsensors, qtbase, qtdeclarative) +addModule(qtconnectivity, qtsystems) +addModule(qtfeedback, qtdeclarative, qtmultimedia) +addModule(qtpim, qtdeclarative, qtjsondb) +addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro) addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) addModule(qtwebkit-examples-and-demos, qtwebkit qttools) addModule(qtimageformats, qtbase) addModule(qtgraphicaleffects, qtdeclarative) addModule(qtscript, qtbase) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) +addModule(qtdocgallery, qtdeclarative, qtjsondb) +!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qt3d b/qt3d new file mode 160000 index 00000000..6b8ee028 --- /dev/null +++ b/qt3d @@ -0,0 +1 @@ +Subproject commit 6b8ee028ac0daae74f5521b9e5562f94b5e8e169 diff --git a/qtconnectivity b/qtconnectivity new file mode 160000 index 00000000..fee6b501 --- /dev/null +++ b/qtconnectivity @@ -0,0 +1 @@ +Subproject commit fee6b50154d583422e6505a60a7d44d726785ab0 diff --git a/qtdocgallery b/qtdocgallery new file mode 160000 index 00000000..f3fa41d4 --- /dev/null +++ b/qtdocgallery @@ -0,0 +1 @@ +Subproject commit f3fa41d4a98f49be8991f615d6d720779a2b5850 diff --git a/qtfeedback b/qtfeedback new file mode 160000 index 00000000..0d85e95a --- /dev/null +++ b/qtfeedback @@ -0,0 +1 @@ +Subproject commit 0d85e95a06ac6b5abbbf6715ae66c1e7109d6392 diff --git a/qtjsondb b/qtjsondb new file mode 160000 index 00000000..3b693a54 --- /dev/null +++ b/qtjsondb @@ -0,0 +1 @@ +Subproject commit 3b693a54e53b6378af23a348ff74bb9d0728f96b diff --git a/qtlocation b/qtlocation new file mode 160000 index 00000000..fd330db9 --- /dev/null +++ b/qtlocation @@ -0,0 +1 @@ +Subproject commit fd330db9e5631438f86e0fae52aea5454519d196 diff --git a/qtpim b/qtpim new file mode 160000 index 00000000..099111a9 --- /dev/null +++ b/qtpim @@ -0,0 +1 @@ +Subproject commit 099111a9fbaf31e954ca91a18d47272590f60ea1 diff --git a/qtsensors b/qtsensors new file mode 160000 index 00000000..b550c498 --- /dev/null +++ b/qtsensors @@ -0,0 +1 @@ +Subproject commit b550c4980cf874ce84419a86c933c32504b9b19d diff --git a/qtsystems b/qtsystems new file mode 160000 index 00000000..620592b4 --- /dev/null +++ b/qtsystems @@ -0,0 +1 @@ +Subproject commit 620592b4bc2fb4f92cfbd6f09eeafb31b30cb941 diff --git a/qtwayland b/qtwayland new file mode 160000 index 00000000..7334963a --- /dev/null +++ b/qtwayland @@ -0,0 +1 @@ +Subproject commit 7334963a7911f5e8cfc18d6a21876bb9c16f1ab8 From 80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 4 Apr 2013 07:37:42 +0200 Subject: [PATCH 09/19] Add new modules (qtquickcontrols, qtserialport and qtx11extras) Also adding qtsensors as part of the default modules and updating its sha1. Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da Reviewed-by: David Faure (KDE) --- .gitmodules | 9 +++++++++ init-repository | 7 +++++++ qt.pro | 3 +++ qtquickcontrols | 1 + qtsensors | 2 +- qtserialport | 1 + qtx11extras | 1 + 7 files changed, 23 insertions(+), 1 deletion(-) create mode 160000 qtquickcontrols create mode 160000 qtserialport create mode 160000 qtx11extras diff --git a/.gitmodules b/.gitmodules index 7d1c81e0..584c4cec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -85,3 +85,12 @@ [submodule "qtgraphicaleffects"] path = qtgraphicaleffects url = git://gitorious.org/qt/qtgraphicaleffects.git +[submodule "qtquickcontrols"] + path = qtquickcontrols + url = git://gitorious.org/qt/qtquickcontrols.git +[submodule "qtserialport"] + path = qtserialport + url = git://gitorious.org/qt/qtserialport.git +[submodule "qtx11extras"] + path = qtx11extras + url = git://gitorious.org/qt/qtx11extras.git diff --git a/init-repository b/init-repository index a89abbff..5a2bd2ce 100755 --- a/init-repository +++ b/init-repository @@ -230,9 +230,11 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtpim qtqa qtquick1 + qtquickcontrols qtrepotools qtscript qtsensors + qtserialport qtsvg qtsystems qttools @@ -240,6 +242,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtwayland qtwebkit qtwebkit-examples-and-demos + qtx11extras qtxmlpatterns ); @@ -254,13 +257,17 @@ my @DEFAULT_REPOS = qw( qtmultimedia qtqa qtquick1 + qtquickcontrols qtrepotools qtscript + qtsensors + qtserialport qtsvg qttools qttranslations qtwebkit qtwebkit-examples-and-demos + qtx11extras qtxmlpatterns ); diff --git a/qt.pro b/qt.pro index 7d1a78b8..3baaf6a5 100644 --- a/qt.pro +++ b/qt.pro @@ -50,11 +50,13 @@ defineTest(addModule) { # it may not build. addModule(qtbase) +addModule(qtx11extras, qtbase) addModule(qlalr, qtbase) addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtjsbackend, qtbase) addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns) +addModule(qtquickcontrols, qtdeclarative) addModule(qtmultimedia, qtdeclarative) addModule(qtactiveqt, qtbase) addModule(qt3d, qtdeclarative) @@ -74,6 +76,7 @@ addModule(qtscript, qtbase) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) addModule(qtdocgallery, qtdeclarative, qtjsondb) !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) +addModule(qtserialport, qtbase) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qtquickcontrols b/qtquickcontrols new file mode 160000 index 00000000..73b21701 --- /dev/null +++ b/qtquickcontrols @@ -0,0 +1 @@ +Subproject commit 73b217015c274e20225f3cd0f7bbb7225b3f201f diff --git a/qtsensors b/qtsensors index b550c498..6a4f3ba1 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b550c4980cf874ce84419a86c933c32504b9b19d +Subproject commit 6a4f3ba1b15a1e2e3c6bf3b4e085db0a47f0b481 diff --git a/qtserialport b/qtserialport new file mode 160000 index 00000000..104780b1 --- /dev/null +++ b/qtserialport @@ -0,0 +1 @@ +Subproject commit 104780b1c8ddbd8bc7da3ad905a7a2df192f46a9 diff --git a/qtx11extras b/qtx11extras new file mode 160000 index 00000000..0ce7f8ac --- /dev/null +++ b/qtx11extras @@ -0,0 +1 @@ +Subproject commit 0ce7f8ac3dc09ae90ba8dd7d6627a0ad7a869040 From 3e26038d5c8cf10900e30dee4b3780ea2dce5f68 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Apr 2013 19:36:14 +0300 Subject: [PATCH 10/19] Updated submodules. Change-Id: I2f8a096c9cf722978f7995097fd2807445898f58 Reviewed-by: Sergio Ahumada --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index b8169e05..b76e6992 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b8169e058a10e44abacd3dd6f3a4432bfdf151e8 +Subproject commit b76e699246385fe467b7635508396e8f76bac93e diff --git a/qtbase b/qtbase index a3f74835..6c879b9b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a3f74835f85c6524c648851454e961bd9cfb9d3f +Subproject commit 6c879b9b7c5099455a29c95b24d6cb7e69baff99 diff --git a/qtdeclarative b/qtdeclarative index f7ada9b9..fedd27e1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f7ada9b9325c7adc10da6a3a4e7f887452682260 +Subproject commit fedd27e1faa65d38a1a5b11f750b5ae2fb5c4006 diff --git a/qtdoc b/qtdoc index aa5cfcd9..bdd5b42d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit aa5cfcd91e7c8b4031e9e61151eee7c0fae4af6b +Subproject commit bdd5b42d2fb42a0b139a043a681010da2530946d diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 23a1dc28..b92e2673 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 23a1dc28177638fdf64a8accad52dc4dd7e5ba2a +Subproject commit b92e2673f1896be9dfe10b512143d6e1b4ff72f7 diff --git a/qtimageformats b/qtimageformats index 50731469..a2cd7f79 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 50731469be7b7c0ed18768789604e13955a8b2f7 +Subproject commit a2cd7f79031ed14b98420ede645376fe71182a1c diff --git a/qtmultimedia b/qtmultimedia index 570f05c2..03ae7a5b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 570f05c2d3ca05ac0955940b6b06fb2b3c015e6a +Subproject commit 03ae7a5b7d6956ab8de2d7f3d05b9cc00e70f69b diff --git a/qtqa b/qtqa index e7115f55..fcec9b11 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e7115f55a8d7d621da46654030a72ca7ae144b56 +Subproject commit fcec9b114a7d5c5249c433202d7616f89120f512 diff --git a/qtquick1 b/qtquick1 index 3eb583f6..183b6904 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 3eb583f6e6e0075583aea7dbf46cf3cec48cb879 +Subproject commit 183b690470fcea9ca1972bfc90e062219b71c38d diff --git a/qtquickcontrols b/qtquickcontrols index 73b21701..9a741263 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 73b217015c274e20225f3cd0f7bbb7225b3f201f +Subproject commit 9a741263dbc52e171bf1277f46efb0b8eb73c4df diff --git a/qtrepotools b/qtrepotools index 5453e0fb..93d3cf19 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 5453e0fb3133cd2e0a10d2b056f5873343a42e6d +Subproject commit 93d3cf19cb519c0505b742872a0f21be1b5f2326 diff --git a/qtscript b/qtscript index a5116f19..c10701b8 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a5116f19e540387fe0653364bbbd9a662bc67b7a +Subproject commit c10701b8fb3b20998f719da2c536e9a09bea0f00 diff --git a/qtsvg b/qtsvg index 9c79ef00..7899765f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9c79ef0046c550614964afb8feb734c96853691c +Subproject commit 7899765f22b31f0c1f1ac6db23988a594dc08fda diff --git a/qttools b/qttools index c216d3ce..2230fe7c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c216d3ced546dd160005912c90694a07b4626942 +Subproject commit 2230fe7c4a9e97e0f2bb24be19f6408857c9864e diff --git a/qtwebkit b/qtwebkit index 2a43c884..4378e482 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 2a43c884303d7a002f6e164aaa5bb7b301425563 +Subproject commit 4378e48208f76ec39fdb32dbdbb0e03dd804bf65 diff --git a/qtx11extras b/qtx11extras index 0ce7f8ac..a203be1f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 0ce7f8ac3dc09ae90ba8dd7d6627a0ad7a869040 +Subproject commit a203be1f4b1cd7fef7970ee9a887cd088e8edf12 diff --git a/qtxmlpatterns b/qtxmlpatterns index 18d558b4..84102e1e 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 18d558b4ab505724d0bd93b5f66997c33a601e04 +Subproject commit 84102e1eaf19ede040444fb458a2fc23ecefb3d4 From fced9b8199a57c0e29fc2029a5705d01f023f673 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Apr 2013 11:41:01 +0300 Subject: [PATCH 11/19] Updated submodules. Change-Id: I3e26038d5c8cf10900e30dee4b3780ea2dce5f68 Reviewed-by: Sergio Ahumada --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index b76e6992..e1084919 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b76e699246385fe467b7635508396e8f76bac93e +Subproject commit e1084919118eae19abc43e06de24dd8467dc6356 diff --git a/qtbase b/qtbase index 6c879b9b..d42e54c8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6c879b9b7c5099455a29c95b24d6cb7e69baff99 +Subproject commit d42e54c8626ee0d42d4df40e8f2a83df0698190a diff --git a/qtdeclarative b/qtdeclarative index fedd27e1..2170a46c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fedd27e1faa65d38a1a5b11f750b5ae2fb5c4006 +Subproject commit 2170a46ceef158eab6ccb7ecbeb26ae3053e6544 diff --git a/qtdoc b/qtdoc index bdd5b42d..cd7de65f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bdd5b42d2fb42a0b139a043a681010da2530946d +Subproject commit cd7de65fbd83c0beaed31b24e82bbcef24d65bb5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index b92e2673..bd434a6e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit b92e2673f1896be9dfe10b512143d6e1b4ff72f7 +Subproject commit bd434a6ea358e96c373e3ad65bfb6d939904abf5 diff --git a/qtimageformats b/qtimageformats index a2cd7f79..847c2ebc 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a2cd7f79031ed14b98420ede645376fe71182a1c +Subproject commit 847c2ebc05a22eb605cbbe06574ed850154c29e8 diff --git a/qtmultimedia b/qtmultimedia index 03ae7a5b..e728a61e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 03ae7a5b7d6956ab8de2d7f3d05b9cc00e70f69b +Subproject commit e728a61eb68c44ef1746804cb379e46be64580e5 diff --git a/qtquick1 b/qtquick1 index 183b6904..4fb85a7d 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 183b690470fcea9ca1972bfc90e062219b71c38d +Subproject commit 4fb85a7d4d9cec253be37fa5cbf744c783902757 diff --git a/qtquickcontrols b/qtquickcontrols index 9a741263..8272730f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 9a741263dbc52e171bf1277f46efb0b8eb73c4df +Subproject commit 8272730f380ec9cf63db828e5726b933c52a98ef diff --git a/qtrepotools b/qtrepotools index 93d3cf19..7b19e265 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 93d3cf19cb519c0505b742872a0f21be1b5f2326 +Subproject commit 7b19e265b40f54e0c8acd4e8c5b54958f31b02f8 diff --git a/qtscript b/qtscript index c10701b8..9799ca40 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c10701b8fb3b20998f719da2c536e9a09bea0f00 +Subproject commit 9799ca408839612de9f5dd79fbaa8ef405d26a27 diff --git a/qtsensors b/qtsensors index 6a4f3ba1..9ad79c10 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6a4f3ba1b15a1e2e3c6bf3b4e085db0a47f0b481 +Subproject commit 9ad79c102ae8429503981551f8cfb482b8595e91 diff --git a/qtserialport b/qtserialport index 104780b1..22e45f0b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 104780b1c8ddbd8bc7da3ad905a7a2df192f46a9 +Subproject commit 22e45f0b0f956c025339d72ad53dca57ef684858 diff --git a/qtsvg b/qtsvg index 7899765f..6821b578 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7899765f22b31f0c1f1ac6db23988a594dc08fda +Subproject commit 6821b578b0c662981906c744d0379feaba1a427f diff --git a/qttools b/qttools index 2230fe7c..795d35c2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2230fe7c4a9e97e0f2bb24be19f6408857c9864e +Subproject commit 795d35c2dc74d499af37b1dfd46a98c98e4c2f45 diff --git a/qttranslations b/qttranslations index 4e896d9e..1a0366fd 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4e896d9ed32af523e8fb951409bf3cc21b4d5718 +Subproject commit 1a0366fd16beb8677ef4535267fd19120402651f diff --git a/qtwebkit b/qtwebkit index 4378e482..9e5eaab3 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 4378e48208f76ec39fdb32dbdbb0e03dd804bf65 +Subproject commit 9e5eaab34ec9fe2a0e0ba169c939a23bef8df900 diff --git a/qtx11extras b/qtx11extras index a203be1f..bcdcf261 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit a203be1f4b1cd7fef7970ee9a887cd088e8edf12 +Subproject commit bcdcf261e3a56de38f23297c1dd784c0c654d0fb diff --git a/qtxmlpatterns b/qtxmlpatterns index 84102e1e..63cf2f14 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 84102e1eaf19ede040444fb458a2fc23ecefb3d4 +Subproject commit 63cf2f14db433cd04cacfc0a0d5a3c2b8c7c9f03 From 6d08e322c7e5f8d32b4a951e47b4288c2654c64c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Apr 2013 19:38:24 +0300 Subject: [PATCH 12/19] Updated submodules. Change-Id: Ifced9b8199a57c0e29fc2029a5705d01f023f673 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qttools | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index d42e54c8..9557cc65 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d42e54c8626ee0d42d4df40e8f2a83df0698190a +Subproject commit 9557cc6536866a9809241ad3bf541e7b1ac84edf diff --git a/qtdeclarative b/qtdeclarative index 2170a46c..99da7a80 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2170a46ceef158eab6ccb7ecbeb26ae3053e6544 +Subproject commit 99da7a805240f64f550572bb6f970b9e68b043c9 diff --git a/qtdoc b/qtdoc index cd7de65f..02157fad 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cd7de65fbd83c0beaed31b24e82bbcef24d65bb5 +Subproject commit 02157fad55433feb586bd16693c8cf971563c124 diff --git a/qtmultimedia b/qtmultimedia index e728a61e..63f0fcb5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e728a61eb68c44ef1746804cb379e46be64580e5 +Subproject commit 63f0fcb5d6b33b85812cf867057862064731b4b8 diff --git a/qtqa b/qtqa index fcec9b11..288c2629 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit fcec9b114a7d5c5249c433202d7616f89120f512 +Subproject commit 288c26290d953d6cea1d7ee57f55a4a988e31098 diff --git a/qtquickcontrols b/qtquickcontrols index 8272730f..2ed163c6 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8272730f380ec9cf63db828e5726b933c52a98ef +Subproject commit 2ed163c6c6cb85b946b4166b3136d43336ff7adf diff --git a/qttools b/qttools index 795d35c2..c4f1ac0f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 795d35c2dc74d499af37b1dfd46a98c98e4c2f45 +Subproject commit c4f1ac0fbcd452f440aee4a3304574cb7fbca0ce From cfbfb612338958b30f0abe2d00c919de693f10c9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 18 Apr 2013 11:38:21 +0300 Subject: [PATCH 13/19] Updated submodules. Change-Id: I6d08e322c7e5f8d32b4a951e47b4288c2654c64c Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 9557cc65..7c791171 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9557cc6536866a9809241ad3bf541e7b1ac84edf +Subproject commit 7c791171a15c9192f4b025a810dde11b7dae2e51 diff --git a/qtdeclarative b/qtdeclarative index 99da7a80..7f4872a3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 99da7a805240f64f550572bb6f970b9e68b043c9 +Subproject commit 7f4872a340f7c9f181479df923ad95c7192a8982 diff --git a/qtqa b/qtqa index 288c2629..045bb298 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 288c26290d953d6cea1d7ee57f55a4a988e31098 +Subproject commit 045bb2988a526696c13b0dcf7eb952b38aca54a5 diff --git a/qtquickcontrols b/qtquickcontrols index 2ed163c6..4883749a 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 2ed163c6c6cb85b946b4166b3136d43336ff7adf +Subproject commit 4883749ae324cfc5b5d758323a9bdbbf4faf1401 From 7b034fec34f488b6d77e97776ad0604b69dbf623 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 17 Apr 2013 11:25:38 +0200 Subject: [PATCH 14/19] skip modules whose mandatory dependencies are missing so that for example "-skip webkit" will also skip qtwebkit-examples. Task-number: QTBUG-30307 Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe Reviewed-by: Joerg Bornemann Reviewed-by: Mitch Curtis --- qt.pro | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt.pro b/qt.pro index 3baaf6a5..33a9469e 100644 --- a/qt.pro +++ b/qt.pro @@ -27,8 +27,12 @@ defineTest(addModule) { export($${mod}.makefile) } - for(d, 2): \ - $${mod}.depends += $$moduleName($$d) + for(d, 2) { + dn = $$moduleName($$d) + !contains(SUBDIRS, $$dn): \ + return(false) + $${mod}.depends += $$dn + } for(d, 3) { dn = $$moduleName($$d) contains(SUBDIRS, $$dn): \ From 09c3d8537e5dc8a7457cd7d7a0b284a0acf51069 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 20 Apr 2013 03:38:18 +0300 Subject: [PATCH 15/19] Updated submodules. Change-Id: Icfbfb612338958b30f0abe2d00c919de693f10c9 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtserialport | 2 +- qtwebkit | 2 +- qtxmlpatterns | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 7c791171..0631caf5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7c791171a15c9192f4b025a810dde11b7dae2e51 +Subproject commit 0631caf55560a650d386978713955599362068d5 diff --git a/qtdeclarative b/qtdeclarative index 7f4872a3..21e162d4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7f4872a340f7c9f181479df923ad95c7192a8982 +Subproject commit 21e162d410a9b5bbb2c3a3e07e004a1a586a1d4f diff --git a/qtdoc b/qtdoc index 02157fad..b2ece437 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 02157fad55433feb586bd16693c8cf971563c124 +Subproject commit b2ece4371429a8064d77c70c070a969ffd2121a5 diff --git a/qtimageformats b/qtimageformats index 847c2ebc..647a7232 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 847c2ebc05a22eb605cbbe06574ed850154c29e8 +Subproject commit 647a72325680b7febfa9c70c8b4dd720004b968a diff --git a/qtmultimedia b/qtmultimedia index 63f0fcb5..7b4c7bda 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 63f0fcb5d6b33b85812cf867057862064731b4b8 +Subproject commit 7b4c7bda730abc8a3929c13d05b5c02b084139e3 diff --git a/qtquickcontrols b/qtquickcontrols index 4883749a..5d6e63dc 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4883749ae324cfc5b5d758323a9bdbbf4faf1401 +Subproject commit 5d6e63dccdbdb9a3ae6b1be325de63283c792ae7 diff --git a/qtserialport b/qtserialport index 22e45f0b..e503daff 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 22e45f0b0f956c025339d72ad53dca57ef684858 +Subproject commit e503daff92735e9f7df7493ffb1b3526005eb07d diff --git a/qtwebkit b/qtwebkit index 9e5eaab3..05d48138 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 9e5eaab34ec9fe2a0e0ba169c939a23bef8df900 +Subproject commit 05d48138c82ddf6b0f070c8216cb8e2c245bb969 diff --git a/qtxmlpatterns b/qtxmlpatterns index 63cf2f14..3bc0756a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 63cf2f14db433cd04cacfc0a0d5a3c2b8c7c9f03 +Subproject commit 3bc0756a63d348d3446d9581f45429c417fd9c29 From 18aaac18064518a3bf03ac624ff0295817fc9418 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 21 Apr 2013 19:38:14 +0300 Subject: [PATCH 16/19] Updated submodules. Change-Id: I09c3d8537e5dc8a7457cd7d7a0b284a0acf51069 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtserialport | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 0631caf5..f78842ab 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0631caf55560a650d386978713955599362068d5 +Subproject commit f78842abe429dc9b42fd15dc8e9e842ab72dcf2b diff --git a/qtdeclarative b/qtdeclarative index 21e162d4..27da8518 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 21e162d410a9b5bbb2c3a3e07e004a1a586a1d4f +Subproject commit 27da851843b12a2379f084d5e3e53a471bd188dd diff --git a/qtquickcontrols b/qtquickcontrols index 5d6e63dc..bf713690 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5d6e63dccdbdb9a3ae6b1be325de63283c792ae7 +Subproject commit bf713690738c4e83a5c72b57b34516f935baf0e9 diff --git a/qtserialport b/qtserialport index e503daff..5cca18d3 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e503daff92735e9f7df7493ffb1b3526005eb07d +Subproject commit 5cca18d3c02869411a92011a76f5b05deba1ffc2 From b25fcb31a7e0b315ea7090e2d4c45fd684313439 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 29 Apr 2013 18:41:26 +0300 Subject: [PATCH 17/19] Updated submodules. Change-Id: I18aaac18064518a3bf03ac624ff0295817fc9418 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtwebkit-examples-and-demos | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qtbase b/qtbase index f78842ab..b27e922e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f78842abe429dc9b42fd15dc8e9e842ab72dcf2b +Subproject commit b27e922e1c74f467843b7b8a01c2229b0fee5367 diff --git a/qtdeclarative b/qtdeclarative index 27da8518..cc17df90 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 27da851843b12a2379f084d5e3e53a471bd188dd +Subproject commit cc17df90b40930d0e978c8268343a2d6ab400e64 diff --git a/qtdoc b/qtdoc index b2ece437..8c8b826d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b2ece4371429a8064d77c70c070a969ffd2121a5 +Subproject commit 8c8b826d6241a2c21359c1dbb83ba57662cc244c diff --git a/qtimageformats b/qtimageformats index 647a7232..f293cc85 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 647a72325680b7febfa9c70c8b4dd720004b968a +Subproject commit f293cc8539da5d4ea915c957abbba473515793ad diff --git a/qtmultimedia b/qtmultimedia index 7b4c7bda..081395a7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7b4c7bda730abc8a3929c13d05b5c02b084139e3 +Subproject commit 081395a749ce4a8e5fe656c0ca4946d302018534 diff --git a/qtqa b/qtqa index 045bb298..0c4a821e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 045bb2988a526696c13b0dcf7eb952b38aca54a5 +Subproject commit 0c4a821e0ceb8afb02ae8b8657c452550c24b2e3 diff --git a/qtquickcontrols b/qtquickcontrols index bf713690..070943e7 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit bf713690738c4e83a5c72b57b34516f935baf0e9 +Subproject commit 070943e78d32aab9eb6e825c5badc2da35851f3a diff --git a/qtrepotools b/qtrepotools index 7b19e265..60a26b7f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7b19e265b40f54e0c8acd4e8c5b54958f31b02f8 +Subproject commit 60a26b7f17d45228157120617216e01455374361 diff --git a/qtscript b/qtscript index 9799ca40..c8566216 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 9799ca408839612de9f5dd79fbaa8ef405d26a27 +Subproject commit c85662167123b433a69a662212c67ce03e44a25a diff --git a/qtsensors b/qtsensors index 9ad79c10..47198045 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9ad79c102ae8429503981551f8cfb482b8595e91 +Subproject commit 47198045f8df3135498f061ae3da5a852a0a150c diff --git a/qtserialport b/qtserialport index 5cca18d3..0add3b93 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 5cca18d3c02869411a92011a76f5b05deba1ffc2 +Subproject commit 0add3b934b8405fc5b65efeba9f05cc1dc353e64 diff --git a/qtsvg b/qtsvg index 6821b578..0eaf799d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6821b578b0c662981906c744d0379feaba1a427f +Subproject commit 0eaf799d8c36d8d877a43a2f9ee71a1a2f968911 diff --git a/qttools b/qttools index c4f1ac0f..32f4fb38 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c4f1ac0fbcd452f440aee4a3304574cb7fbca0ce +Subproject commit 32f4fb387800974df8275b4d460430fb31b8c93a diff --git a/qtwebkit b/qtwebkit index 05d48138..79318124 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 05d48138c82ddf6b0f070c8216cb8e2c245bb969 +Subproject commit 79318124ab940b5b286ec9e1b1f4c8533324c5a8 diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos index 08118e86..82985425 160000 --- a/qtwebkit-examples-and-demos +++ b/qtwebkit-examples-and-demos @@ -1 +1 @@ -Subproject commit 08118e862731b5ce91368d326a04b4a565e7f483 +Subproject commit 82985425670256a3ab194771184e50c63be82625 diff --git a/qtx11extras b/qtx11extras index bcdcf261..a03d4ddf 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit bcdcf261e3a56de38f23297c1dd784c0c654d0fb +Subproject commit a03d4ddf0a8eda87e6a9043259f224a03d4bc68c diff --git a/qtxmlpatterns b/qtxmlpatterns index 3bc0756a..3ca482d0 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 3bc0756a63d348d3446d9581f45429c417fd9c29 +Subproject commit 3ca482d01c07ee25213533b31a3ad626c224d95e From 730e330068b4d2bc6098a8a4dbbd7fb98aef5452 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 30 Apr 2013 11:23:38 +0200 Subject: [PATCH 18/19] renamed qtwebkit-examples-and-demos => qtwebkit-examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21 Reviewed-by: Sergio Ahumada Reviewed-by: Simo Fält --- .gitmodules | 6 +++--- init-repository | 6 +++--- qt.pro | 2 +- qtwebkit-examples-and-demos => qtwebkit-examples | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename qtwebkit-examples-and-demos => qtwebkit-examples (100%) diff --git a/.gitmodules b/.gitmodules index 584c4cec..5c2c6ad9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,9 +37,9 @@ [submodule "qtwebkit"] path = qtwebkit url = git://gitorious.org/qt/qtwebkit.git -[submodule "qtwebkit-examples-and-demos"] - path = qtwebkit-examples-and-demos - url = git://gitorious.org/qt/qtwebkit-examples-and-demos.git +[submodule "qtwebkit-examples"] + path = qtwebkit-examples + url = git://gitorious.org/qt/qtwebkit-examples.git [submodule "qtqa"] path = qtqa url = git://gitorious.org/qt/qtqa.git diff --git a/init-repository b/init-repository index 5a2bd2ce..3bd600ff 100755 --- a/init-repository +++ b/init-repository @@ -241,7 +241,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qttranslations qtwayland qtwebkit - qtwebkit-examples-and-demos + qtwebkit-examples qtx11extras qtxmlpatterns ); @@ -266,7 +266,7 @@ my @DEFAULT_REPOS = qw( qttools qttranslations qtwebkit - qtwebkit-examples-and-demos + qtwebkit-examples qtx11extras qtxmlpatterns ); @@ -419,7 +419,7 @@ sub git_disable_webkit_submodule my ($self) = @_; $self->exe('git', 'config', '--remove', 'submodule.qtwebkit'); - $self->exe('git', 'config', '--remove', 'submodule.qtwebkit-examples-and-demos'); + $self->exe('git', 'config', '--remove', 'submodule.qtwebkit-examples'); return; } diff --git a/qt.pro b/qt.pro index 33a9469e..218701ab 100644 --- a/qt.pro +++ b/qt.pro @@ -73,7 +73,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative, qtjsondb) addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro) addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) -addModule(qtwebkit-examples-and-demos, qtwebkit qttools) +addModule(qtwebkit-examples, qtwebkit qttools) addModule(qtimageformats, qtbase) addModule(qtgraphicaleffects, qtdeclarative) addModule(qtscript, qtbase) diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples similarity index 100% rename from qtwebkit-examples-and-demos rename to qtwebkit-examples From 33072afc5874185fdee79aefda03ebe6a82ca401 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 30 Apr 2013 11:29:49 +0200 Subject: [PATCH 19/19] use relative submodule specs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this saves various trouble. this syntax is supported since git 1.7.0. Change-Id: I5bbc31c2ba01e7ec0129bf45b9f704c380bf11a3 Reviewed-by: Tony Sarajärvi Reviewed-by: Simo Fält Reviewed-by: Oswald Buddenhagen --- .gitmodules | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5c2c6ad9..d8c8bd28 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,96 +1,96 @@ [submodule "qtbase"] path = qtbase - url = git://gitorious.org/qt/qtbase.git + url = ../qtbase.git [submodule "qtsvg"] path = qtsvg - url = git://gitorious.org/qt/qtsvg.git + url = ../qtsvg.git [submodule "qtdeclarative"] path = qtdeclarative - url = git://gitorious.org/qt/qtdeclarative.git + url = ../qtdeclarative.git [submodule "qtactiveqt"] path = qtactiveqt - url = git://gitorious.org/qt/qtactiveqt.git + url = ../qtactiveqt.git [submodule "qtscript"] path = qtscript - url = git://gitorious.org/qt/qtscript.git + url = ../qtscript.git [submodule "qtmultimedia"] path = qtmultimedia - url = git://gitorious.org/qt/qtmultimedia.git + url = ../qtmultimedia.git [submodule "qttools"] path = qttools - url = git://gitorious.org/qt/qttools.git + url = ../qttools.git [submodule "qtxmlpatterns"] path = qtxmlpatterns - url = git://gitorious.org/qt/qtxmlpatterns.git + url = ../qtxmlpatterns.git [submodule "qttranslations"] path = qttranslations - url = git://gitorious.org/qt/qttranslations.git + url = ../qttranslations.git [submodule "qtdoc"] path = qtdoc - url = git://gitorious.org/qt/qtdoc.git + url = ../qtdoc.git [submodule "qlalr"] path = qlalr - url = git://gitorious.org/qt/qlalr.git + url = ../qlalr.git [submodule "qtrepotools"] path = qtrepotools - url = git://gitorious.org/qt/qtrepotools.git + url = ../qtrepotools.git [submodule "qtwebkit"] path = qtwebkit - url = git://gitorious.org/qt/qtwebkit.git + url = ../qtwebkit.git [submodule "qtwebkit-examples"] path = qtwebkit-examples - url = git://gitorious.org/qt/qtwebkit-examples.git + url = ../qtwebkit-examples.git [submodule "qtqa"] path = qtqa - url = git://gitorious.org/qt/qtqa.git + url = ../qtqa.git [submodule "qtlocation"] path = qtlocation - url = git://gitorious.org/qt/qtlocation.git + url = ../qtlocation.git [submodule "qtsensors"] path = qtsensors - url = git://gitorious.org/qt/qtsensors.git + url = ../qtsensors.git [submodule "qtsystems"] path = qtsystems - url = git://gitorious.org/qt/qtsystems.git + url = ../qtsystems.git [submodule "qtfeedback"] path = qtfeedback - url = git://gitorious.org/qt/qtfeedback.git + url = ../qtfeedback.git [submodule "qtdocgallery"] path = qtdocgallery - url = git://gitorious.org/qt/qtdocgallery.git + url = ../qtdocgallery.git [submodule "qtpim"] path = qtpim - url = git://gitorious.org/qt/qtpim.git + url = ../qtpim.git [submodule "qtconnectivity"] path = qtconnectivity - url = git://gitorious.org/qt/qtconnectivity.git + url = ../qtconnectivity.git [submodule "qtwayland"] path = qtwayland - url = git://gitorious.org/qt/qtwayland.git + url = ../qtwayland.git [submodule "qtjsondb"] path = qtjsondb - url = git://gitorious.org/qt/qtjsondb.git + url = ../qtjsondb.git [submodule "qt3d"] path = qt3d - url = git://gitorious.org/qt/qt3d.git + url = ../qt3d.git [submodule "qtjsbackend"] path = qtjsbackend - url = git://gitorious.org/qt/qtjsbackend.git + url = ../qtjsbackend.git [submodule "qtimageformats"] path = qtimageformats - url = git://gitorious.org/qt/qtimageformats.git + url = ../qtimageformats.git [submodule "qtquick1"] path = qtquick1 - url = git://gitorious.org/qt/qtquick1.git + url = ../qtquick1.git [submodule "qtgraphicaleffects"] path = qtgraphicaleffects - url = git://gitorious.org/qt/qtgraphicaleffects.git + url = ../qtgraphicaleffects.git [submodule "qtquickcontrols"] path = qtquickcontrols - url = git://gitorious.org/qt/qtquickcontrols.git + url = ../qtquickcontrols.git [submodule "qtserialport"] path = qtserialport - url = git://gitorious.org/qt/qtserialport.git + url = ../qtserialport.git [submodule "qtx11extras"] path = qtx11extras - url = git://gitorious.org/qt/qtx11extras.git + url = ../qtx11extras.git