From a89c6ef7033a29c0f0a17e68624bbdbba1653263 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 18 Sep 2015 08:33:11 +0200 Subject: Manual update of qttools to remove webkit dependency Change-Id: I6cf6ae75cedb0945c46fd9b3fa63bd21a9ce4806 Reviewed-by: Simon Hausmann --- qttools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qttools b/qttools index 35955d20..9452d2ce 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 35955d20ffac7020b5cdeebf1292151a809ee43c +Subproject commit 9452d2ce70d6cbc7ea87f3f1c49af5bd092ae074 -- cgit v1.2.3 From 944aa6bcbbe8ba940f5814c8128818311e46f35a Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 21 Sep 2015 10:46:32 +0300 Subject: Updated submodules. Change-Id: I3c4cdbef3f8fbc016757fdd6a4b5bb8eb6a644df Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtbase b/qtbase index d36a1dfb..c326cc86 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d36a1dfb51af3f981262bc8e8fcd22b91aa890a6 +Subproject commit c326cc86925ac6cb2e9b119d225be266bdbe043c diff --git a/qtcanvas3d b/qtcanvas3d index e23e1417..2e9976f1 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit e23e14172d89481467718e62637c7be339c597cc +Subproject commit 2e9976f1d35a6c94d7cf71f9306a4a8f37c7b1f0 diff --git a/qtconnectivity b/qtconnectivity index 7a0a5edc..b88f1678 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7a0a5edcc747bdef71f11638a8c3c47fb31f8be6 +Subproject commit b88f167840b0449aa130fc81ee8ee8e2caf028fe diff --git a/qtdoc b/qtdoc index 5d4f8b8e..87cf2f6b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5d4f8b8e221fad487efcf3cfefc3359b69e7a609 +Subproject commit 87cf2f6bab7f5b110ce8ff46d944dc5146ad4bcb diff --git a/qtenginio b/qtenginio index 7984ac15..99076694 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 7984ac158b882f9864a388d628ec7274be7a07f6 +Subproject commit 9907669444871ebe50b15f293b2bd480df8aae85 diff --git a/qtlocation b/qtlocation index a99b8ced..116b41ee 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a99b8ced41b2c634598ce70fe69036a0ed34e9ba +Subproject commit 116b41eed67ca923ca205d2c7aa0776b0eaa1a4e diff --git a/qtqa b/qtqa index 5cb6ae7e..25b525e7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5cb6ae7e79059a8350b74771f656a0a6c408fc1f +Subproject commit 25b525e7017a5fd8035077719ef66505883fa3a4 diff --git a/qtquickcontrols b/qtquickcontrols index 417fd8ae..f22ea338 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 417fd8ae2e16cbf5d19a728354f2fea248d7f740 +Subproject commit f22ea338a91c2e0bddc011762a64105e7d5698a0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7e6973ad..2b40d7b8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7e6973ad91efd62a3f4e4bb6592dd8e04e7225c0 +Subproject commit 2b40d7b8bb85db0d4f15fe77c451af4473f29c32 diff --git a/qtrepotools b/qtrepotools index 45210131..2cdbcc84 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 4521013190bc81ac1deebb27bb0debf34deca6f4 +Subproject commit 2cdbcc846c2d5ec233ea5189d1eb92c1d48b6c36 diff --git a/qtserialport b/qtserialport index 55f39fe0..918b22ae 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 55f39fe09aaf6208fd27c3c6060d4ab0171f77b1 +Subproject commit 918b22aef140d293721f0d81ea8988c1d35db582 diff --git a/qtwebengine b/qtwebengine index ba80558d..4de39455 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ba80558d0bc5586a02f125d62db8fc49e3f763a0 +Subproject commit 4de39455cde341998321f9c0c8d8e28394c1796e diff --git a/qtwebview b/qtwebview index 1b5a6930..a99da3b6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 1b5a69309d2702b8339c9829f86ea685ca4ad903 +Subproject commit a99da3b6f74c6f42af0f80f0a1d4951ed42bf3ce diff --git a/qtwinextras b/qtwinextras index d6208094..df47b74d 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit d6208094e75086bca4e9dadb4ba34b21c51e02d9 +Subproject commit df47b74d3881efcfb485ddcc5495214047e69a95 -- cgit v1.2.3 From c42dd3462b18b3f85c32d1dd207922183e706fe4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 22 Sep 2015 11:08:11 +0200 Subject: Updated submodules. Change-Id: If0045fccac1af79e858831c75c7808fe6997e37e Reviewed-by: Simon Hausmann Reviewed-by: Frederik Gladhorn --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index d6f2aaed..3b54c5bf 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d6f2aaedf03739f34d1b0c4f363634883e8f4187 +Subproject commit 3b54c5bfc17f91ce175b7b2d05482f48c514a15e diff --git a/qtbase b/qtbase index c326cc86..0829baf9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c326cc86925ac6cb2e9b119d225be266bdbe043c +Subproject commit 0829baf902dbf5982732aa54454178f55b50bdc6 diff --git a/qtdeclarative b/qtdeclarative index 76c7d955..884097f4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 76c7d955d6a30338749d570c804d052320fb6d91 +Subproject commit 884097f463b1ab8c3fed929c3586d6ceea612442 diff --git a/qtdoc b/qtdoc index 87cf2f6b..3988558d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 87cf2f6bab7f5b110ce8ff46d944dc5146ad4bcb +Subproject commit 3988558d6edc34987dc1af8696425213852a2c40 diff --git a/qtmultimedia b/qtmultimedia index 0b192ce2..416db331 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0b192ce23ef38ef1f1b8d3dd5d2cfc386c9e5a36 +Subproject commit 416db33110f0392ba3f882f395168cbe37fed6ff diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2b40d7b8..3ebcf54e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2b40d7b8bb85db0d4f15fe77c451af4473f29c32 +Subproject commit 3ebcf54e63f29d57e189895bdf52f6b5199e827f diff --git a/qttools b/qttools index 9452d2ce..c49abe10 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9452d2ce70d6cbc7ea87f3f1c49af5bd092ae074 +Subproject commit c49abe10e442605af61923a779faeb2ffd91d30a diff --git a/qtwebengine b/qtwebengine index 4de39455..345be059 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4de39455cde341998321f9c0c8d8e28394c1796e +Subproject commit 345be059cd1432016f556fcb329eb9d3993d4911 -- cgit v1.2.3 From d7f477d1cd1fbad5fb0609f340af278cab8c6bae Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 7 Sep 2015 11:00:01 +0200 Subject: Add qtpurchasing as non-default module For 5.6 this is a tech preview, it will be added properly in 5.7. Change-Id: I709830fbcfc439d5446718093f0c16ad2dcb1e57 Reviewed-by: Frederik Gladhorn --- .gitmodules | 4 ++++ qt.pro | 1 + qtpurchasing | 1 + 3 files changed, 6 insertions(+) create mode 160000 qtpurchasing diff --git a/.gitmodules b/.gitmodules index b8fbe40d..211c331c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -190,3 +190,7 @@ url = ../qtquickcontrols2.git branch = 5.6 initrepo = true +[submodule "qtpurchasing"] + path = qtpurchasing + url = ../qtpurchasing.git + branch = 5.6 diff --git a/qt.pro b/qt.pro index b55805c9..a9ade877 100644 --- a/qt.pro +++ b/qt.pro @@ -93,6 +93,7 @@ addModule(qtserialbus, qtbase) addModule(qtserialport, qtbase) addModule(qtenginio, qtdeclarative) addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation) +addModule(qtpurchasing, qtbase, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qtpurchasing b/qtpurchasing new file mode 160000 index 00000000..951d75d7 --- /dev/null +++ b/qtpurchasing @@ -0,0 +1 @@ +Subproject commit 951d75d744ab66665b41d533ce3d38df07c04005 -- cgit v1.2.3 From 942ae1dd8224e8d22d900765f90803efaf49b47d Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 26 Nov 2013 14:20:34 -0800 Subject: Add a way to build just a few of Qt's modules more easily The current way requires passing -skip to configure, which is a list of what not to build. To set a list of what to build (e.g., for testing, in a specialized build, etc.), there was no way. Now you can just do: qmake "QT_BUILD_MODULES=qtbase qtdeclarative qtsvg qtxmlpatterns" (the order doesn't matter) Change-Id: Ifcaefa35b16b137866ca839a483ce366e35de7ab Reviewed-by: Oswald Buddenhagen --- qt.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/qt.pro b/qt.pro index a9ade877..efa091ee 100644 --- a/qt.pro +++ b/qt.pro @@ -14,6 +14,7 @@ defineReplace(moduleName) { # Arguments: module name, [mandatory deps], [optional deps], [project file] defineTest(addModule) { contains(QT_SKIP_MODULES, $$1): return(false) + !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$1): return(false) mod = $$moduleName($$1) isEmpty(4) { -- cgit v1.2.3 From ae1dc7aa3ebe215e17b71b6de2c11692e318c608 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 25 Sep 2015 15:22:35 +0200 Subject: Updated submodules. Change-Id: Ic5ea73d6ca0ea2e174cd592226a16885a73aeed1 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtbase b/qtbase index 0829baf9..462f355e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0829baf902dbf5982732aa54454178f55b50bdc6 +Subproject commit 462f355e4fb16cc7a1838fa2dda0f763eee58c84 diff --git a/qtcanvas3d b/qtcanvas3d index 2e9976f1..c9c85831 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2e9976f1d35a6c94d7cf71f9306a4a8f37c7b1f0 +Subproject commit c9c8583159ec81460e4b53bc12998a50ece44409 diff --git a/qtconnectivity b/qtconnectivity index b88f1678..caef6445 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b88f167840b0449aa130fc81ee8ee8e2caf028fe +Subproject commit caef6445a95dd1941fdf583f09407e1e32b11249 diff --git a/qtdeclarative b/qtdeclarative index 884097f4..e255fdf2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 884097f463b1ab8c3fed929c3586d6ceea612442 +Subproject commit e255fdf207891765aa550709e084614242aebeec diff --git a/qtdoc b/qtdoc index 3988558d..ab706a08 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3988558d6edc34987dc1af8696425213852a2c40 +Subproject commit ab706a089b48eb17c45239fb61eb5f2a47ad6cb0 diff --git a/qtlocation b/qtlocation index 116b41ee..acdb40b6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 116b41eed67ca923ca205d2c7aa0776b0eaa1a4e +Subproject commit acdb40b607607330b236027c80b466f5cbffed93 diff --git a/qtquickcontrols b/qtquickcontrols index f22ea338..53ff51b6 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit f22ea338a91c2e0bddc011762a64105e7d5698a0 +Subproject commit 53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3ebcf54e..d5408fe6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3ebcf54e63f29d57e189895bdf52f6b5199e827f +Subproject commit d5408fe6c01dd9a3c5e9b943db5abda755df0b12 diff --git a/qtrepotools b/qtrepotools index 2cdbcc84..854c5377 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 2cdbcc846c2d5ec233ea5189d1eb92c1d48b6c36 +Subproject commit 854c5377227f1543ec55231811e02a073e6ae1a6 diff --git a/qtserialport b/qtserialport index 918b22ae..a1655d6c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 918b22aef140d293721f0d81ea8988c1d35db582 +Subproject commit a1655d6ccf3f82508286b471819cc5e5cb64ff44 diff --git a/qttools b/qttools index c49abe10..01b0e90f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c49abe10e442605af61923a779faeb2ffd91d30a +Subproject commit 01b0e90fa10d188765d50cb1d1356845dbcf7c09 diff --git a/qtwayland b/qtwayland index 41be0132..c6dc4f47 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 41be013249f9b2d70d7e33dbf297c92d671d8f1d +Subproject commit c6dc4f473518d4a739445a66858115309507797e diff --git a/qtwebengine b/qtwebengine index 345be059..76c7af60 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 345be059cd1432016f556fcb329eb9d3993d4911 +Subproject commit 76c7af60c351cacbce01c89b7e2e7f1df536c7aa diff --git a/qtwebview b/qtwebview index a99da3b6..aecb2337 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a99da3b6f74c6f42af0f80f0a1d4951ed42bf3ce +Subproject commit aecb233776acd141ca1b46dfd7a0e74f1b17efa7 -- cgit v1.2.3 From c78fc65631b3bf935979a82140ecae629576ec9c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sat, 26 Sep 2015 11:04:21 +0200 Subject: Updated submodules. Change-Id: Ia0a52a43a8c5fa7516c1469241a449c457153040 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 462f355e..393c8d0b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 462f355e4fb16cc7a1838fa2dda0f763eee58c84 +Subproject commit 393c8d0b74ded30c40a5321df5cbbc76dac66eda diff --git a/qtdeclarative b/qtdeclarative index e255fdf2..6ef2ca90 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e255fdf207891765aa550709e084614242aebeec +Subproject commit 6ef2ca90e21b57fb74bb7a8985ef9c7fadc1b613 diff --git a/qtqa b/qtqa index 25b525e7..f5df7096 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 25b525e7017a5fd8035077719ef66505883fa3a4 +Subproject commit f5df7096578ada814d6485d9b7a8eafb468fc6ad diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d5408fe6..82559c06 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d5408fe6c01dd9a3c5e9b943db5abda755df0b12 +Subproject commit 82559c068a6000e0a048ddb3590fc03761f236b7 diff --git a/qttools b/qttools index 01b0e90f..48bd9fce 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 01b0e90fa10d188765d50cb1d1356845dbcf7c09 +Subproject commit 48bd9fce66b766409c476087cecb3d44e94d8124 diff --git a/qtwebengine b/qtwebengine index 76c7af60..e561b9a6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 76c7af60c351cacbce01c89b7e2e7f1df536c7aa +Subproject commit e561b9a645a7f9f67f1c2cf3d267b27d66529eb9 -- cgit v1.2.3 From d16a8656f9fea0689ec989ca8a449d557166f8fe Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 5 Oct 2015 07:39:46 +0300 Subject: Updated submodules. Change-Id: I871b519649bb6130db128d7ae4c0916ee2e48146 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qt3d b/qt3d index 3b54c5bf..1663e2d0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3b54c5bfc17f91ce175b7b2d05482f48c514a15e +Subproject commit 1663e2d030ddcf6f7e0ac1222705ac109211ae4c diff --git a/qtactiveqt b/qtactiveqt index 2dd46cd2..149634cb 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2dd46cd24fec4e98bab1e6d0deadbd626951648c +Subproject commit 149634cb909b6e6918a644b9dc6d2b1ff4612837 diff --git a/qtbase b/qtbase index 393c8d0b..fe383e04 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 393c8d0b74ded30c40a5321df5cbbc76dac66eda +Subproject commit fe383e045b713bed5c2171b2b09e620d9acd3ffb diff --git a/qtconnectivity b/qtconnectivity index caef6445..81a8a877 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit caef6445a95dd1941fdf583f09407e1e32b11249 +Subproject commit 81a8a8771f987ebfefbffc1a7a4003cbf0a1760d diff --git a/qtdeclarative b/qtdeclarative index 6ef2ca90..1a335f6a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6ef2ca90e21b57fb74bb7a8985ef9c7fadc1b613 +Subproject commit 1a335f6ae320dfedef617564a161b73ff276ca5b diff --git a/qtdoc b/qtdoc index ab706a08..afd7fe1b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ab706a089b48eb17c45239fb61eb5f2a47ad6cb0 +Subproject commit afd7fe1bf1342d8240f689a50dae7fe3be9ab05b diff --git a/qtenginio b/qtenginio index 99076694..6b058fbd 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 9907669444871ebe50b15f293b2bd480df8aae85 +Subproject commit 6b058fbd8be8604d3796a4ae690c85482eb772ca diff --git a/qtgraphicaleffects b/qtgraphicaleffects index bf36ed32..3f3359af 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit bf36ed32ade5937f7a9a90cb74a93132abb183f4 +Subproject commit 3f3359aff5a167b22fbec5836ffd8455fde1a14d diff --git a/qtimageformats b/qtimageformats index ab1f3ee4..bdc2df1a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ab1f3ee4c5fea333d5c0d3a6eb9eeda987763cc9 +Subproject commit bdc2df1a04f65c35651ad962f12723e177f4bd2f diff --git a/qtlocation b/qtlocation index acdb40b6..b645aeb8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit acdb40b607607330b236027c80b466f5cbffed93 +Subproject commit b645aeb834314d59bab0a336802409bb4b004feb diff --git a/qtmultimedia b/qtmultimedia index 416db331..c5ebfb0c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 416db33110f0392ba3f882f395168cbe37fed6ff +Subproject commit c5ebfb0c19deff34eea5099ba59750b746257d71 diff --git a/qtqa b/qtqa index f5df7096..dca19142 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f5df7096578ada814d6485d9b7a8eafb468fc6ad +Subproject commit dca1914237fd5d1fb6398d4de5e85591db94917c diff --git a/qtquickcontrols b/qtquickcontrols index 53ff51b6..d7f3ab35 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719 +Subproject commit d7f3ab35deeed07404990591d232b559ac960c61 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 82559c06..a0c19178 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 82559c068a6000e0a048ddb3590fc03761f236b7 +Subproject commit a0c19178dac1808a3d040204609aa97b5baa3c18 diff --git a/qtscript b/qtscript index 65782261..021a5032 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 657822611315760a8b4599b36884f3c1b17ee1ef +Subproject commit 021a503205caf1c645aca0610f3b6fc07a17f998 diff --git a/qtsensors b/qtsensors index b925c6d8..556c25d9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b925c6d82bdd0603edfa9ee160ed9aec704c7434 +Subproject commit 556c25d95adc43d9d7e4532ab23118ba125f8a5a diff --git a/qtserialport b/qtserialport index a1655d6c..6630994a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a1655d6ccf3f82508286b471819cc5e5cb64ff44 +Subproject commit 6630994af46d22503982d54c72a8fe5cd5e51be5 diff --git a/qtsvg b/qtsvg index 12f2e8ac..daca6017 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 12f2e8ac4f5d47347b739514e994a41c084b5088 +Subproject commit daca60175f2401f54709be610f999ab6e4444411 diff --git a/qttools b/qttools index 48bd9fce..9ed1cfb2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 48bd9fce66b766409c476087cecb3d44e94d8124 +Subproject commit 9ed1cfb27d7354cbc1020563569b8f65a3311303 diff --git a/qttranslations b/qttranslations index 1a1bf9d6..9c6d1af7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1a1bf9d6cb78e39047d92c214b45404f8c0c424e +Subproject commit 9c6d1af76ac28de8d59be344ea3a21b2607fa118 diff --git a/qtwayland b/qtwayland index c6dc4f47..8acf507e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c6dc4f473518d4a739445a66858115309507797e +Subproject commit 8acf507ea4975326701f4aa8f03534044678cd82 diff --git a/qtwebchannel b/qtwebchannel index 7561e510..459a6ad0 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 7561e51004e94cff4fcf2b10acfd2d1ddb2a29a3 +Subproject commit 459a6ad0ae963b30c484a14b8cb910a29e1b1dcb diff --git a/qtwebengine b/qtwebengine index e561b9a6..32424c28 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e561b9a645a7f9f67f1c2cf3d267b27d66529eb9 +Subproject commit 32424c285915b4b5d550d0980e8c33c7f5c53312 diff --git a/qtwebsockets b/qtwebsockets index f11862a0..6484afa4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f11862a05591452bdad9c1abd244288a2964a036 +Subproject commit 6484afa4b7645b31e370f4eb8ea0b93fc3bf052a diff --git a/qtxmlpatterns b/qtxmlpatterns index c4fd65e4..840c8621 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit c4fd65e40d093908f4f5be919a88930c799a2569 +Subproject commit 840c86217b687cffffd8734ea04320538be3a0c4 -- cgit v1.2.3 From ee443af31444ccb847201e95d22a75d8aa07d613 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 29 Sep 2015 13:09:02 +0200 Subject: Add qtserialport as dependency for qtlocation Task-number: QTBUG-48082 Change-Id: I7b90777bfdd1286f6340caf756562146772d0bb3 Reviewed-by: Alex Blasche --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index efa091ee..7ae7905e 100644 --- a/qt.pro +++ b/qt.pro @@ -72,7 +72,6 @@ addModule(qtmultimedia, qtbase, qtdeclarative) addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia) addModule(qtactiveqt, qtbase) addModule(qtsystems, qtbase, qtdeclarative) -addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtsystems) addModule(qtsensors, qtbase, qtdeclarative) addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative) addModule(qtfeedback, qtdeclarative, qtmultimedia) @@ -92,6 +91,7 @@ addModule(qtdocgallery, qtdeclarative) addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialbus, qtbase) addModule(qtserialport, qtbase) +addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtserialport qtsystems) addModule(qtenginio, qtdeclarative) addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation) addModule(qtpurchasing, qtbase, qtdeclarative) -- cgit v1.2.3 From 383b2585e367b54b5c60034480ad748b8d871d14 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 23 Sep 2015 12:44:04 +0200 Subject: Explain what the canonical URLs are. This caught me out the first time I tried to use init-repository. Documentation should work for noobs. Change-Id: Ia6c9ce395ace034128bfe80f2c31be7f9cd4cf35 Reviewed-by: Oswald Buddenhagen --- init-repository | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 91d27824..91c0519f 100755 --- a/init-repository +++ b/init-repository @@ -48,7 +48,8 @@ init-repository - initialize the Qt5 repository and all submodules ./init-repository [options] This script may be run after an initial `git clone' of Qt5 in order to check -out all submodules. +out all submodules. It fetches them from canonical URLs inferred from the +clone's origin. =head1 OPTIONS -- cgit v1.2.3 From 6382845a6da84f54ddffd37ef526f4eac87f73a4 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Fri, 2 Oct 2015 11:12:03 +0300 Subject: Update build instructions for commercial licensees Add build instructions for commercial licensees as well so that the same README covers both opensource and enterprise users. This removes the need having separate README file for commercial users. Change-Id: Ibd3012b428c6fa85f47c1c459d8029ebfce92046 Reviewed-by: Jani Heikkinen Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll --- README | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/README b/README index 8211fa47..ff169fe2 100644 --- a/README +++ b/README @@ -39,11 +39,24 @@ HOW TO BUILD QT5 The "bin" folder of the ICU installation should be appended to the PATH environment variable in order to for the DLLs to be found at run-time. + Licensing: + ---------- + + Opensource users: + + = qt-everywhere-opensource-src- + = -opensource + + Commercial users: + + = qt-everywhere-enterprise-src- + = -commercial + Linux, Mac: ----------- - cd /qt-everywhere-opensource-src- - ./configure -prefix $PWD/qtbase -opensource -nomake tests + cd / + ./configure -prefix $PWD/qtbase -nomake tests make -j 4 Windows: @@ -55,8 +68,8 @@ HOW TO BUILD QT5 * Python version 2.7 or later [http://www.activestate.com/activepython/] * Ruby version 1.9.3 or later [http://rubyinstaller.org/] - cd \qt-everywhere-opensource-src- - configure -prefix %CD%\qtbase -opensource -nomake tests + cd \ + configure -prefix %CD%\qtbase -nomake tests nmake // jom // mingw32-make To accelerate the bootstrap of qmake with MSVC, it may be useful to pass @@ -81,13 +94,13 @@ HOW TO BUILD QT5 Example for a release build: (adjust the `-jN' parameter as appropriate for your system) - ./configure -prefix $PWD/qtbase -opensource + ./configure -prefix $PWD/qtbase make -j4 Example for a developer build: (enables more autotests, builds debug version of libraries, ...) - ./configure -developer-build -opensource + ./configure -developer-build make -j4 See output of `./configure -help' for documentation on various options to @@ -100,7 +113,7 @@ HOW TO BUILD QT5 a `make module-'. For example, to build only qtscript and qtwebkit, and the modules they depend on: - ./configure -prefix $PWD/qtbase -opensource + ./configure -prefix $PWD/qtbase make -j4 module-qtscript module-qtwebkit This can save a lot of time if you are only interested in a subset of Qt5. -- cgit v1.2.3 From 0c4ec778f53d8ff9e5503e66b26ea61d4c10b700 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 29 Sep 2015 13:00:17 +0200 Subject: declare qtgraphicaleffects before qtquickcontrols otherwise the dependency is botched. amends 30e19df5b. Change-Id: I8e17d2f91c7c55c49be6239268f928ae4577d17c Reviewed-by: Mitch Curtis --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index 7ae7905e..6e7096d3 100644 --- a/qt.pro +++ b/qt.pro @@ -66,6 +66,7 @@ addModule(qtx11extras, qtbase) addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns) +addModule(qtgraphicaleffects, qtdeclarative) addModule(qtquickcontrols, qtdeclarative, qtgraphicaleffects) addModule(qtquickcontrols2, qtquickcontrols) addModule(qtmultimedia, qtbase, qtdeclarative) @@ -84,7 +85,6 @@ addModule(qtwebkit-examples, qtwebkit qttools) addModule(qtimageformats, qtbase) addModule(qt3d, qtdeclarative qtimageformats) addModule(qtcanvas3d, qtdeclarative) -addModule(qtgraphicaleffects, qtdeclarative) addModule(qtscript, qtbase, qttools) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns) addModule(qtdocgallery, qtdeclarative) -- cgit v1.2.3 From 6f0713adf6a2050a10a53c5abfad17140789c5fc Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 12 Oct 2015 07:27:03 +0300 Subject: Updated submodules. Change-Id: Ifc06de16a694d8d24bdea3a81e796a0c460e1864 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qt3d b/qt3d index 1663e2d0..70b2528a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1663e2d030ddcf6f7e0ac1222705ac109211ae4c +Subproject commit 70b2528a70a870de46eeb1f824701d53d5be2b74 diff --git a/qtactiveqt b/qtactiveqt index 149634cb..824df695 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 149634cb909b6e6918a644b9dc6d2b1ff4612837 +Subproject commit 824df695ad99d6096c2744bd476f75822cee1323 diff --git a/qtbase b/qtbase index fe383e04..2463b445 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fe383e045b713bed5c2171b2b09e620d9acd3ffb +Subproject commit 2463b4452da6267d23bf1008a6472b30690690bc diff --git a/qtcanvas3d b/qtcanvas3d index c9c85831..54f29b95 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit c9c8583159ec81460e4b53bc12998a50ece44409 +Subproject commit 54f29b951bd046705c68d936d8f2e3ce98d1b24d diff --git a/qtconnectivity b/qtconnectivity index 81a8a877..6b258fb2 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 81a8a8771f987ebfefbffc1a7a4003cbf0a1760d +Subproject commit 6b258fb24019811af6ca1f5449daeee02c58014d diff --git a/qtdeclarative b/qtdeclarative index 1a335f6a..8e7d1a91 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1a335f6ae320dfedef617564a161b73ff276ca5b +Subproject commit 8e7d1a91196197eee4e45bbfa9886ab935e2b67c diff --git a/qtdoc b/qtdoc index afd7fe1b..b42a8500 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit afd7fe1bf1342d8240f689a50dae7fe3be9ab05b +Subproject commit b42a8500824b630bb189a80b3eb175fa76565563 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3f3359af..a00a5a15 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3f3359aff5a167b22fbec5836ffd8455fde1a14d +Subproject commit a00a5a151bb7e98ff81c7a47ab9db507cb348c6c diff --git a/qtlocation b/qtlocation index b645aeb8..12a3b61b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b645aeb834314d59bab0a336802409bb4b004feb +Subproject commit 12a3b61b29bfe2aa7e861e2b5b94b623c1d0a41f diff --git a/qtmacextras b/qtmacextras index ee2e66ab..30fe82eb 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ee2e66abc45549b96e4b3ec47cbf693090ee751e +Subproject commit 30fe82eb89e7b7f66444f5fabae9ac0954b1fecf diff --git a/qtmultimedia b/qtmultimedia index c5ebfb0c..3727a588 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c5ebfb0c19deff34eea5099ba59750b746257d71 +Subproject commit 3727a588eeac37bf8830146efe76695361e6a343 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a0c19178..57f877bd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a0c19178dac1808a3d040204609aa97b5baa3c18 +Subproject commit 57f877bd984a0befb57626421a6e36ed373056ce diff --git a/qtsensors b/qtsensors index 556c25d9..d8e357f7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 556c25d95adc43d9d7e4532ab23118ba125f8a5a +Subproject commit d8e357f75a05bce5e1286c94e2b1954f6591218e diff --git a/qtserialport b/qtserialport index 6630994a..ba8748b7 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6630994af46d22503982d54c72a8fe5cd5e51be5 +Subproject commit ba8748b77a55ee7102c728995c4194a2915863d6 diff --git a/qtwayland b/qtwayland index 8acf507e..a727ee0b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8acf507ea4975326701f4aa8f03534044678cd82 +Subproject commit a727ee0b2f1044ad8d5689208aed3f469b8de1ba diff --git a/qtwebengine b/qtwebengine index 32424c28..2e9c6cd0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 32424c285915b4b5d550d0980e8c33c7f5c53312 +Subproject commit 2e9c6cd0bd6789a4f46fe0bcfbd522f0dd3eb4cb diff --git a/qtwebsockets b/qtwebsockets index 6484afa4..7784b52c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6484afa4b7645b31e370f4eb8ea0b93fc3bf052a +Subproject commit 7784b52c31d50ab81597c38bcf55b63e2f1a4f82 diff --git a/qtwinextras b/qtwinextras index df47b74d..bc436dfe 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit df47b74d3881efcfb485ddcc5495214047e69a95 +Subproject commit bc436dfec3c8cf10dbbb2ff51fd9ab003620b5dd diff --git a/qtxmlpatterns b/qtxmlpatterns index 840c8621..688b29fc 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 840c86217b687cffffd8734ea04320538be3a0c4 +Subproject commit 688b29fc5aeab0eafbb457a0fa6953856eeac928 -- cgit v1.2.3 From 17c6369c9e6846ba303d70d3a1bdf043db5e63ce Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 15 Oct 2015 15:03:56 +0200 Subject: Updated submodules. Change-Id: I3094692e61e5a41116d69053d1f296eac46e545b Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index 70b2528a..379316e6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 70b2528a70a870de46eeb1f824701d53d5be2b74 +Subproject commit 379316e6aa919c0fdda6b0fbaa5b6baf4c81fdca diff --git a/qtactiveqt b/qtactiveqt index 824df695..f79954ee 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 824df695ad99d6096c2744bd476f75822cee1323 +Subproject commit f79954ee9f75e90030dca5824bdc8adb66cba5f1 diff --git a/qtbase b/qtbase index 2463b445..4f7e0bdc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2463b4452da6267d23bf1008a6472b30690690bc +Subproject commit 4f7e0bdc4c18b8d0a1e317ddae2d2caa80b59c8e diff --git a/qtcanvas3d b/qtcanvas3d index 54f29b95..3534d9a6 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 54f29b951bd046705c68d936d8f2e3ce98d1b24d +Subproject commit 3534d9a6fa7d1d2034963732e22081182864ae83 diff --git a/qtconnectivity b/qtconnectivity index 6b258fb2..62ecca3d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6b258fb24019811af6ca1f5449daeee02c58014d +Subproject commit 62ecca3d957f80d9acc7116d362517b03b2301a3 diff --git a/qtdeclarative b/qtdeclarative index 8e7d1a91..5b726c31 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8e7d1a91196197eee4e45bbfa9886ab935e2b67c +Subproject commit 5b726c3135f7a86e9712d393ae5e75cca73b8e57 diff --git a/qtdoc b/qtdoc index b42a8500..eeba1cb1 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b42a8500824b630bb189a80b3eb175fa76565563 +Subproject commit eeba1cb12d5022b1303c2cb67f0f94384d650632 diff --git a/qtenginio b/qtenginio index 6b058fbd..67025069 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 6b058fbd8be8604d3796a4ae690c85482eb772ca +Subproject commit 6702506920e61fe7af38222928528553c5a1f167 diff --git a/qtlocation b/qtlocation index 12a3b61b..cd543e15 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 12a3b61b29bfe2aa7e861e2b5b94b623c1d0a41f +Subproject commit cd543e15c12c838eb0b30fc1d656bdebda13b324 diff --git a/qtmultimedia b/qtmultimedia index 3727a588..f5235af0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3727a588eeac37bf8830146efe76695361e6a343 +Subproject commit f5235af0dc3aa433435dbd42b716776097af5acf diff --git a/qtqa b/qtqa index dca19142..f44dccbc 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dca1914237fd5d1fb6398d4de5e85591db94917c +Subproject commit f44dccbc223adda12647db16d8db3c9a2245ecf3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 57f877bd..8a161292 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 57f877bd984a0befb57626421a6e36ed373056ce +Subproject commit 8a1612920d040c4256eed146a369ec0827a8a1c9 diff --git a/qtscript b/qtscript index 021a5032..7ebf02ea 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 021a503205caf1c645aca0610f3b6fc07a17f998 +Subproject commit 7ebf02ea3e8e91b13eb2d34847c005d8a487e9da diff --git a/qtserialport b/qtserialport index ba8748b7..5f8f57df 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ba8748b77a55ee7102c728995c4194a2915863d6 +Subproject commit 5f8f57dfb53c1954715257be926915d24734b391 diff --git a/qttools b/qttools index 9ed1cfb2..1ed9418c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9ed1cfb27d7354cbc1020563569b8f65a3311303 +Subproject commit 1ed9418c0f38190cd839164229eeb7504438f740 diff --git a/qtwebengine b/qtwebengine index 2e9c6cd0..0e955583 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2e9c6cd0bd6789a4f46fe0bcfbd522f0dd3eb4cb +Subproject commit 0e9555838c83ccf5a6a28ee99d6fd556ebf5b3b2 diff --git a/qtwebsockets b/qtwebsockets index 7784b52c..7074823b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 7784b52c31d50ab81597c38bcf55b63e2f1a4f82 +Subproject commit 7074823ba6eebc51e04437a24cff158260d4a700 diff --git a/qtwinextras b/qtwinextras index bc436dfe..ccbed888 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit bc436dfec3c8cf10dbbb2ff51fd9ab003620b5dd +Subproject commit ccbed88825cef76545e1e3a47c92fb237e4beeb9 -- cgit v1.2.3 From a0309a7a43a404ebb1bf1a193732860bd3edfe9b Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 9 Oct 2015 18:41:37 +0200 Subject: Fix dependency order for qtlocation and qtwebview Change-Id: Ie61b69be3b38975675fff3553d1f5c9510e7865e Reviewed-by: Alex Blasche Reviewed-by: Oswald Buddenhagen --- qt.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qt.pro b/qt.pro index 6e7096d3..d96659e2 100644 --- a/qt.pro +++ b/qt.pro @@ -59,7 +59,6 @@ ANDROID_EXTRAS = android: ANDROID_EXTRAS = qtandroidextras addModule(qtbase) -addModule(qtwebview, qtdeclarative, qtwebengine) addModule(qtandroidextras, qtbase) addModule(qtmacextras, qtbase) addModule(qtx11extras, qtbase) @@ -79,6 +78,8 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative) addModule(qtwebsockets, qtbase, qtdeclarative) addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets) +addModule(qtserialport, qtbase) +addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtserialport qtsystems) addModule(qtwebkit, qtbase, qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns, WebKit.pro) addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) addModule(qtwebkit-examples, qtwebkit qttools) @@ -90,10 +91,9 @@ addModule(qtquick1, qtscript, qtsvg qtxmlpatterns) addModule(qtdocgallery, qtdeclarative) addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialbus, qtbase) -addModule(qtserialport, qtbase) -addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtserialport qtsystems) addModule(qtenginio, qtdeclarative) addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation) +addModule(qtwebview, qtdeclarative, qtwebengine) addModule(qtpurchasing, qtbase, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) -- cgit v1.2.3 From 5197447fd048a712ab6690c691d546b733a11ae8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 23 Oct 2015 20:45:07 +0200 Subject: Update WebEngine manually This brings in MSVC 2015 fixes and RHEL/OpenSuSE build fixes Change-Id: I796c153a005e964c4a32203cfe08cbf3ece5f39e Reviewed-by: Simon Hausmann --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 0e955583..427e5bc2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0e9555838c83ccf5a6a28ee99d6fd556ebf5b3b2 +Subproject commit 427e5bc2d49ea4422eafbcd316c88d0713ac6ea8 -- cgit v1.2.3 From 98717e27d0b326187c6a0c4c7844e68df33d3415 Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Sun, 25 Oct 2015 21:06:57 +0100 Subject: Update Qt3d manually Fixes some nasty threading problems related to pick event race conditions and QThreadPool thread recycling. Change-Id: I977ad310d1a767abc0fbcca49f9088ff5fdda708 Reviewed-by: Simon Hausmann --- qt3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3d b/qt3d index 379316e6..12461331 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 379316e6aa919c0fdda6b0fbaa5b6baf4c81fdca +Subproject commit 12461331112e06dc9bae36e03b2fa96a3784f103 -- cgit v1.2.3 From 95a89a8b5a009925a77c5ff274160ca014c911d0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 27 Oct 2015 13:14:27 +0100 Subject: Manual update of qtmultimedia In order to bring in the missing libs for QTBUG-48914 Change-Id: I678dcd1ca5bdae66efdd09b809ff63c7da37d58a Reviewed-by: Simon Hausmann --- qtmultimedia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtmultimedia b/qtmultimedia index f5235af0..ac1b772e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f5235af0dc3aa433435dbd42b716776097af5acf +Subproject commit ac1b772ec8e428acd23322a6fccbde2bda6b8bd2 -- cgit v1.2.3 From ddcc9b234eeade218066d22026502132f179fcfc Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Wed, 28 Oct 2015 19:59:38 +0100 Subject: Update Qt3d manually Fixes a crash at destruction. Change-Id: Ie773b3def96cc1e55baa36b9ff7cf697770d479e Reviewed-by: Sean Harmer --- qt3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3d b/qt3d index 12461331..68d32040 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 12461331112e06dc9bae36e03b2fa96a3784f103 +Subproject commit 68d32040f688aeebb8236e13effcfd9da43de71c -- cgit v1.2.3 From 4aabf3e19d8ec1ed012ad52c6d52f09f4543df2c Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Fri, 30 Oct 2015 14:30:15 +0200 Subject: Updated submodules. Change-Id: I4f71eed2d556219480490f433323db4c151b4ba7 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/qt3d b/qt3d index 68d32040..0dbded15 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 68d32040f688aeebb8236e13effcfd9da43de71c +Subproject commit 0dbded1506abf172b7b3cf7685bdcb30c7b8012d diff --git a/qtactiveqt b/qtactiveqt index f79954ee..0215031c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f79954ee9f75e90030dca5824bdc8adb66cba5f1 +Subproject commit 0215031cceaaa667f1bafd04f3f40e5bf0676121 diff --git a/qtandroidextras b/qtandroidextras index 2eb5decb..8e288bab 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 2eb5decb8245a7e93c4901872d21306b34dc018d +Subproject commit 8e288bab3779af178284be07f49d93ade6bfba70 diff --git a/qtbase b/qtbase index 4f7e0bdc..ff3ba104 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f7e0bdc4c18b8d0a1e317ddae2d2caa80b59c8e +Subproject commit ff3ba1045e8322caa0293b05aecbff4411963ea2 diff --git a/qtcanvas3d b/qtcanvas3d index 3534d9a6..a84dad27 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 3534d9a6fa7d1d2034963732e22081182864ae83 +Subproject commit a84dad27182ba6cb4c6f9bf4008a9e63346a7a83 diff --git a/qtconnectivity b/qtconnectivity index 62ecca3d..0bd4e597 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 62ecca3d957f80d9acc7116d362517b03b2301a3 +Subproject commit 0bd4e597145b8d94bee54fe86114893120afc97f diff --git a/qtdeclarative b/qtdeclarative index 5b726c31..388e85f1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5b726c3135f7a86e9712d393ae5e75cca73b8e57 +Subproject commit 388e85f18b7f79c733c9b684de6907378f7a108a diff --git a/qtdoc b/qtdoc index eeba1cb1..a982d750 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit eeba1cb12d5022b1303c2cb67f0f94384d650632 +Subproject commit a982d7501ec377045f1cf4bcf7eef9891605be54 diff --git a/qtenginio b/qtenginio index 67025069..34d66f38 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 6702506920e61fe7af38222928528553c5a1f167 +Subproject commit 34d66f3836051dca35a854577fe04b45af3630f2 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index a00a5a15..ad227e98 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit a00a5a151bb7e98ff81c7a47ab9db507cb348c6c +Subproject commit ad227e9808288b12726114365ae1474386c6cdf8 diff --git a/qtimageformats b/qtimageformats index bdc2df1a..67cbcf39 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit bdc2df1a04f65c35651ad962f12723e177f4bd2f +Subproject commit 67cbcf399aa1a18b9b1dbac0a6572a865687230a diff --git a/qtlocation b/qtlocation index cd543e15..1fd85dd9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit cd543e15c12c838eb0b30fc1d656bdebda13b324 +Subproject commit 1fd85dd9426b65198b396c686edd42e42d5b8149 diff --git a/qtmacextras b/qtmacextras index 30fe82eb..1243e7e8 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 30fe82eb89e7b7f66444f5fabae9ac0954b1fecf +Subproject commit 1243e7e8647579da7a96cc4f7fb18b3105ebe9e8 diff --git a/qtmultimedia b/qtmultimedia index ac1b772e..3ab55ed9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ac1b772ec8e428acd23322a6fccbde2bda6b8bd2 +Subproject commit 3ab55ed987af90488116b0b3e238f32b99515316 diff --git a/qtqa b/qtqa index f44dccbc..c12aa999 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f44dccbc223adda12647db16d8db3c9a2245ecf3 +Subproject commit c12aa99906bda69d04a91f358a0b9106c04b2b52 diff --git a/qtquickcontrols b/qtquickcontrols index d7f3ab35..2e48d16e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d7f3ab35deeed07404990591d232b559ac960c61 +Subproject commit 2e48d16e4a230069884ac0585ae111037f4171fb diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8a161292..19e7cc53 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8a1612920d040c4256eed146a369ec0827a8a1c9 +Subproject commit 19e7cc53a7189c5c35a478d06b435433297771c5 diff --git a/qtrepotools b/qtrepotools index 854c5377..3564f7cb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 854c5377227f1543ec55231811e02a073e6ae1a6 +Subproject commit 3564f7cbbf073db127d843b80944fbdb74f9749e diff --git a/qtsensors b/qtsensors index d8e357f7..d8d4a5e9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d8e357f75a05bce5e1286c94e2b1954f6591218e +Subproject commit d8d4a5e9ac1251e82d1ec639bc3bff7e7f53c083 diff --git a/qtserialport b/qtserialport index 5f8f57df..2575d33f 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 5f8f57dfb53c1954715257be926915d24734b391 +Subproject commit 2575d33fab4042baba67384f92119c58c0ce0245 diff --git a/qtsvg b/qtsvg index daca6017..9ee5ee12 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit daca60175f2401f54709be610f999ab6e4444411 +Subproject commit 9ee5ee12a7b92a57624dafed935b3ac1fad426d9 diff --git a/qttools b/qttools index 1ed9418c..b06d812e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1ed9418c0f38190cd839164229eeb7504438f740 +Subproject commit b06d812edba87fc550177caf0be508375a7780c6 diff --git a/qtwayland b/qtwayland index a727ee0b..257519ce 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a727ee0b2f1044ad8d5689208aed3f469b8de1ba +Subproject commit 257519ce8a6fc225e04313ae27cd63643b75f0fd diff --git a/qtwebchannel b/qtwebchannel index 459a6ad0..97577a0f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 459a6ad0ae963b30c484a14b8cb910a29e1b1dcb +Subproject commit 97577a0f27a1f427948871ae535645a2e0788bf7 diff --git a/qtwebengine b/qtwebengine index 427e5bc2..cfee4521 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 427e5bc2d49ea4422eafbcd316c88d0713ac6ea8 +Subproject commit cfee452174c58fe4048b1604503d03de2764fc8e diff --git a/qtwebsockets b/qtwebsockets index 7074823b..469f7485 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 7074823ba6eebc51e04437a24cff158260d4a700 +Subproject commit 469f748515b65cd4c9bec8794ec37ca6cf5df026 diff --git a/qtwebview b/qtwebview index aecb2337..a37fdfd9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit aecb233776acd141ca1b46dfd7a0e74f1b17efa7 +Subproject commit a37fdfd9be608a1faea762d06b41eedfc8f8fc27 diff --git a/qtwinextras b/qtwinextras index ccbed888..c49209f2 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ccbed88825cef76545e1e3a47c92fb237e4beeb9 +Subproject commit c49209f274ca5b487eb4f94400cec5d5567dec60 diff --git a/qtxmlpatterns b/qtxmlpatterns index 688b29fc..94136d42 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 688b29fc5aeab0eafbb457a0fa6953856eeac928 +Subproject commit 94136d42805abeaf3dd9d6ded7b74e3d27fd3777 -- cgit v1.2.3 From d55a9e3a66d573649099ad4270f2ee01ca94a657 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 6 Nov 2015 22:57:43 +0100 Subject: Updated submodules. Change-Id: I0793599392d2e64ceabe8d0f24ba7cb0abc76b84 Reviewed-by: Frederik Gladhorn --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qt3d b/qt3d index 0dbded15..6ec968be 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0dbded1506abf172b7b3cf7685bdcb30c7b8012d +Subproject commit 6ec968bec872dfbab98be0752cab134ba057dd19 diff --git a/qtactiveqt b/qtactiveqt index 0215031c..4abafae3 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0215031cceaaa667f1bafd04f3f40e5bf0676121 +Subproject commit 4abafae33c9b911e8458f31b7611991d9430217b diff --git a/qtbase b/qtbase index ff3ba104..e996d68f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ff3ba1045e8322caa0293b05aecbff4411963ea2 +Subproject commit e996d68f6130847637ba287518cff1289cfa48e5 diff --git a/qtcanvas3d b/qtcanvas3d index a84dad27..bb1504c2 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit a84dad27182ba6cb4c6f9bf4008a9e63346a7a83 +Subproject commit bb1504c271e18a26ad6ac20d55485c167671b1c2 diff --git a/qtconnectivity b/qtconnectivity index 0bd4e597..04c01d56 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0bd4e597145b8d94bee54fe86114893120afc97f +Subproject commit 04c01d562a41cc0e287d698666e648e14fb6d3f1 diff --git a/qtdeclarative b/qtdeclarative index 388e85f1..15a07dbd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 388e85f18b7f79c733c9b684de6907378f7a108a +Subproject commit 15a07dbd30e3b242a0495eb6a3316411b493fab3 diff --git a/qtdoc b/qtdoc index a982d750..882cab50 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a982d7501ec377045f1cf4bcf7eef9891605be54 +Subproject commit 882cab507e6c2ab7eac140881db0411b62976aaa diff --git a/qtenginio b/qtenginio index 34d66f38..c07f53b0 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 34d66f3836051dca35a854577fe04b45af3630f2 +Subproject commit c07f53b02545e88614cf6a519d46abb6e89aee0d diff --git a/qtgraphicaleffects b/qtgraphicaleffects index ad227e98..5d458e1e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit ad227e9808288b12726114365ae1474386c6cdf8 +Subproject commit 5d458e1ef23274921295bfbc20bebf439643d1a2 diff --git a/qtlocation b/qtlocation index 1fd85dd9..83065c75 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1fd85dd9426b65198b396c686edd42e42d5b8149 +Subproject commit 83065c750b428c1c695821a4fdc02a259d392645 diff --git a/qtmultimedia b/qtmultimedia index 3ab55ed9..dfa57af6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3ab55ed987af90488116b0b3e238f32b99515316 +Subproject commit dfa57af6dede877cf41b77f391ce73b811ad250c diff --git a/qtqa b/qtqa index c12aa999..5a91683e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c12aa99906bda69d04a91f358a0b9106c04b2b52 +Subproject commit 5a91683e47f8bcc1b7ae02dc04e0bef8d7bafa23 diff --git a/qtquickcontrols b/qtquickcontrols index 2e48d16e..3660cd60 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 2e48d16e4a230069884ac0585ae111037f4171fb +Subproject commit 3660cd60e9a8f74203b2eefef23f4baa383f75c3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 19e7cc53..de8f22df 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 19e7cc53a7189c5c35a478d06b435433297771c5 +Subproject commit de8f22df824eb5259bb84ec878f077f959983d92 diff --git a/qtserialport b/qtserialport index 2575d33f..13fa77f5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 2575d33fab4042baba67384f92119c58c0ce0245 +Subproject commit 13fa77f5cbbc7d5d717c3663512b904bba8c106c diff --git a/qttools b/qttools index b06d812e..c6ee8682 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b06d812edba87fc550177caf0be508375a7780c6 +Subproject commit c6ee868252ff30f1bb8d23ba4df5f53bf5a62b8a diff --git a/qttranslations b/qttranslations index 9c6d1af7..eac94f16 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 9c6d1af76ac28de8d59be344ea3a21b2607fa118 +Subproject commit eac94f16918bd54920652088a59dd2092a26a4b6 diff --git a/qtwayland b/qtwayland index 257519ce..618c2bfc 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 257519ce8a6fc225e04313ae27cd63643b75f0fd +Subproject commit 618c2bfc35b522d2fae05b00b0ef5412d9bf28f5 diff --git a/qtwebengine b/qtwebengine index cfee4521..cadcec65 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cfee452174c58fe4048b1604503d03de2764fc8e +Subproject commit cadcec655e53819e891eb3c7b0155087d86b2688 diff --git a/qtwebview b/qtwebview index a37fdfd9..521d6fd0 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a37fdfd9be608a1faea762d06b41eedfc8f8fc27 +Subproject commit 521d6fd0536b72565ca5a2ae9d9cd1514bb0e4e1 diff --git a/qtxmlpatterns b/qtxmlpatterns index 94136d42..ee56885f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 94136d42805abeaf3dd9d6ded7b74e3d27fd3777 +Subproject commit ee56885f52b63132bffafad1ccc8830a65d129fa -- cgit v1.2.3 From 1197dbb1dba907bd84e3f4420d063a78fa4ed3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 12 Nov 2015 14:18:09 +0100 Subject: Updated submodules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8e348f3cab39f75acb68b2bdc388cd37927424bb Reviewed-by: Jędrzej Nowacki Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 6ec968be..90050075 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6ec968bec872dfbab98be0752cab134ba057dd19 +Subproject commit 9005007577211f37a986ca5c02c5e5b69102ec0c diff --git a/qtbase b/qtbase index e996d68f..5956d871 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e996d68f6130847637ba287518cff1289cfa48e5 +Subproject commit 5956d8715c7f8c77221b2baeeff0b7fa807f8f0e diff --git a/qtconnectivity b/qtconnectivity index 04c01d56..34904f02 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 04c01d562a41cc0e287d698666e648e14fb6d3f1 +Subproject commit 34904f021fbee34ec51c732fa28a5bd7ffabdde8 diff --git a/qtdeclarative b/qtdeclarative index 15a07dbd..4ff385e8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 15a07dbd30e3b242a0495eb6a3316411b493fab3 +Subproject commit 4ff385e8cd509ab735e3dc5149273fe75d2de105 diff --git a/qtdoc b/qtdoc index 882cab50..22abd7af 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 882cab507e6c2ab7eac140881db0411b62976aaa +Subproject commit 22abd7afc725840018c1b7ec50d3cd7b54dfef71 diff --git a/qtmultimedia b/qtmultimedia index dfa57af6..da0b7aea 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit dfa57af6dede877cf41b77f391ce73b811ad250c +Subproject commit da0b7aea9adae024d5ea885c7e7589de86ce80f8 diff --git a/qtqa b/qtqa index 5a91683e..a5620b6a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5a91683e47f8bcc1b7ae02dc04e0bef8d7bafa23 +Subproject commit a5620b6a0b5887f6f7b4e0f19ea85e7b7277c76f diff --git a/qtquickcontrols b/qtquickcontrols index 3660cd60..0d2066ff 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3660cd60e9a8f74203b2eefef23f4baa383f75c3 +Subproject commit 0d2066ff8459f00af8f8195780d064023b8d1c38 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index de8f22df..bf55d2b1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit de8f22df824eb5259bb84ec878f077f959983d92 +Subproject commit bf55d2b1659290753641ee862f814ab8781cfa94 diff --git a/qttools b/qttools index c6ee8682..ff1cfccd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c6ee868252ff30f1bb8d23ba4df5f53bf5a62b8a +Subproject commit ff1cfccd3208b59c431f5b0280b687eab411eb27 diff --git a/qtwayland b/qtwayland index 618c2bfc..4d3c3a08 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 618c2bfc35b522d2fae05b00b0ef5412d9bf28f5 +Subproject commit 4d3c3a08eba8d30805f18397c98e19ab9fd40722 diff --git a/qtwebengine b/qtwebengine index cadcec65..c61fa3df 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cadcec655e53819e891eb3c7b0155087d86b2688 +Subproject commit c61fa3df0fc3373de79a633da8f9b42d41523b55 diff --git a/qtwebview b/qtwebview index 521d6fd0..40c1f009 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 521d6fd0536b72565ca5a2ae9d9cd1514bb0e4e1 +Subproject commit 40c1f009a3487ab96748826a142d04f8ec281ef1 -- cgit v1.2.3 From 83b45e90309c83665b8691a1a5c000efdde154fd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 10 Nov 2015 13:21:10 +0100 Subject: declare mandatory dep serialbus => serialport Change-Id: I35c5f18b7c8856071413e50590308f402be7e528 Reviewed-by: Rolf Eike Beer Reviewed-by: Alex Blasche --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index d96659e2..f1274801 100644 --- a/qt.pro +++ b/qt.pro @@ -90,7 +90,7 @@ addModule(qtscript, qtbase, qttools) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns) addModule(qtdocgallery, qtdeclarative) addModule(qtwayland, qtbase, qtdeclarative) -addModule(qtserialbus, qtbase) +addModule(qtserialbus, qtserialport) addModule(qtenginio, qtdeclarative) addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation) addModule(qtwebview, qtdeclarative, qtwebengine) -- cgit v1.2.3 From f128a9a7e1009d9ee11665dce08d5bfafa91ef66 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sat, 14 Nov 2015 16:10:28 +0100 Subject: Updated submodules. Change-Id: Id3463e24f1aecc6e2d4d040bc7878ad1d48f6327 Reviewed-by: Frederik Gladhorn Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index 90050075..6e5c2360 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9005007577211f37a986ca5c02c5e5b69102ec0c +Subproject commit 6e5c2360c0eda7efb60c9ecf9c88d463384aa53d diff --git a/qtactiveqt b/qtactiveqt index 4abafae3..6b0be668 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4abafae33c9b911e8458f31b7611991d9430217b +Subproject commit 6b0be66831556649c0b8a7e2cd0cf421eef629cd diff --git a/qtbase b/qtbase index 5956d871..8ff36d48 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5956d8715c7f8c77221b2baeeff0b7fa807f8f0e +Subproject commit 8ff36d48978cbdc848053338a7cec3d990da4ff2 diff --git a/qtconnectivity b/qtconnectivity index 34904f02..b303d272 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 34904f021fbee34ec51c732fa28a5bd7ffabdde8 +Subproject commit b303d2724720f3b8b0639d2d4394447cd5e24be4 diff --git a/qtdeclarative b/qtdeclarative index 4ff385e8..805cb851 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4ff385e8cd509ab735e3dc5149273fe75d2de105 +Subproject commit 805cb851fdd26b30fe2a1ef27e3e429d319ea335 diff --git a/qtqa b/qtqa index a5620b6a..e1c341a4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a5620b6a0b5887f6f7b4e0f19ea85e7b7277c76f +Subproject commit e1c341a40dc8d0edcc5ba2f5015efeced37c85ab diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bf55d2b1..0a0902b1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bf55d2b1659290753641ee862f814ab8781cfa94 +Subproject commit 0a0902b10d3135b0697741cc9b1f5b1b318eeb1f diff --git a/qttools b/qttools index ff1cfccd..b6ae248b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ff1cfccd3208b59c431f5b0280b687eab411eb27 +Subproject commit b6ae248bd3a05d123d8dc53fcd773b6a89f12f55 diff --git a/qttranslations b/qttranslations index eac94f16..2d9a8c83 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit eac94f16918bd54920652088a59dd2092a26a4b6 +Subproject commit 2d9a8c83893be4abde136ec87fc3db220ce8a0a5 diff --git a/qtwebengine b/qtwebengine index c61fa3df..70a376d7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c61fa3df0fc3373de79a633da8f9b42d41523b55 +Subproject commit 70a376d73718cc4ff8d96f6761b8c1896ca25c23 diff --git a/qtwebview b/qtwebview index 40c1f009..73c53941 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 40c1f009a3487ab96748826a142d04f8ec281ef1 +Subproject commit 73c53941e0f4563be266076dd8fd8838039d4d27 -- cgit v1.2.3 From d527415ac62b062323f5ce7f10d87ec0fd43bfee Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Mon, 30 Nov 2015 08:29:33 +0200 Subject: Updated submodules. Change-Id: Id124a31338548d9a76baa908b281b3bb6ede168a Reviewed-by: Iikka Eklund --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qt3d b/qt3d index 6e5c2360..c74ddf56 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6e5c2360c0eda7efb60c9ecf9c88d463384aa53d +Subproject commit c74ddf562cf02ac2516db0c5f492cf7198a5e25a diff --git a/qtactiveqt b/qtactiveqt index 6b0be668..1fc0866f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 6b0be66831556649c0b8a7e2cd0cf421eef629cd +Subproject commit 1fc0866f4fc07b6ae503bdd24c6fe98d0714ed2a diff --git a/qtbase b/qtbase index 8ff36d48..6302fb07 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8ff36d48978cbdc848053338a7cec3d990da4ff2 +Subproject commit 6302fb07e763a3a59458dab38445a22ba7833d7e diff --git a/qtconnectivity b/qtconnectivity index b303d272..e117459e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b303d2724720f3b8b0639d2d4394447cd5e24be4 +Subproject commit e117459e0d3d0670aa2cc60dfa3eafe81bbf11a9 diff --git a/qtdeclarative b/qtdeclarative index 805cb851..fe2e7b73 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 805cb851fdd26b30fe2a1ef27e3e429d319ea335 +Subproject commit fe2e7b73402583e996c1fa05d78abd04a4d95b76 diff --git a/qtdoc b/qtdoc index 22abd7af..60f415fc 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 22abd7afc725840018c1b7ec50d3cd7b54dfef71 +Subproject commit 60f415fc7c793bc00b2b017583745fb426a9fdc4 diff --git a/qtenginio b/qtenginio index c07f53b0..d08c5e0f 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit c07f53b02545e88614cf6a519d46abb6e89aee0d +Subproject commit d08c5e0f9a29a09be05d34e6f67afea5cee1fc96 diff --git a/qtimageformats b/qtimageformats index 67cbcf39..531c30ea 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 67cbcf399aa1a18b9b1dbac0a6572a865687230a +Subproject commit 531c30ea66d2b8fe517c89bed149a938e16332ec diff --git a/qtlocation b/qtlocation index 83065c75..eea31518 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 83065c750b428c1c695821a4fdc02a259d392645 +Subproject commit eea315187d1add70aaf69745c031b8d6342b2303 diff --git a/qtmacextras b/qtmacextras index 1243e7e8..d8ebb7ee 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 1243e7e8647579da7a96cc4f7fb18b3105ebe9e8 +Subproject commit d8ebb7eeea7e6b19763f248d1e04e8a22b91bad5 diff --git a/qtmultimedia b/qtmultimedia index da0b7aea..1950765b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit da0b7aea9adae024d5ea885c7e7589de86ce80f8 +Subproject commit 1950765b655307fd138f4c48e54d8932c734fbee diff --git a/qtqa b/qtqa index e1c341a4..2c352647 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e1c341a40dc8d0edcc5ba2f5015efeced37c85ab +Subproject commit 2c352647f6c8511fe5b44725bb068cc91e676106 diff --git a/qtquickcontrols b/qtquickcontrols index 0d2066ff..a3ba1a53 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0d2066ff8459f00af8f8195780d064023b8d1c38 +Subproject commit a3ba1a532f92a933141d4671ce644053a0cb6fea diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0a0902b1..87a4d340 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0a0902b10d3135b0697741cc9b1f5b1b318eeb1f +Subproject commit 87a4d340ef2438f43cfc795bb27947b125b3d2cf diff --git a/qtscript b/qtscript index 7ebf02ea..94307729 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 7ebf02ea3e8e91b13eb2d34847c005d8a487e9da +Subproject commit 94307729ed362dde428582603234ad2ec964d4c4 diff --git a/qtsvg b/qtsvg index 9ee5ee12..84eae855 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9ee5ee12a7b92a57624dafed935b3ac1fad426d9 +Subproject commit 84eae855ee57ab1c37c8a84ad7e7afcd40b919e6 diff --git a/qttools b/qttools index b6ae248b..82b6bcae 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b6ae248bd3a05d123d8dc53fcd773b6a89f12f55 +Subproject commit 82b6bcaeb30c29e9152e97e6898414acba7d402f diff --git a/qtwebengine b/qtwebengine index 70a376d7..e68d1ad0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 70a376d73718cc4ff8d96f6761b8c1896ca25c23 +Subproject commit e68d1ad06599eae1b0785263f3a0863701e6f1bc diff --git a/qtwebview b/qtwebview index 73c53941..356c60f2 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 73c53941e0f4563be266076dd8fd8838039d4d27 +Subproject commit 356c60f2aaf7881f08a07aaf38bece8bbaa39d8d -- cgit v1.2.3 From 2a46300588dfddfe2ca7bcc81010f156a134d47f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 17 Nov 2015 14:07:18 +0100 Subject: error-check dependency declarations Change-Id: I98ad68d8be608b144c5f2ff422aaf7baab9907e8 Reviewed-by: Joerg Bornemann Reviewed-by: Frederik Gladhorn --- qt.pro | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qt.pro b/qt.pro index f1274801..be193c55 100644 --- a/qt.pro +++ b/qt.pro @@ -13,6 +13,12 @@ defineReplace(moduleName) { # Arguments: module name, [mandatory deps], [optional deps], [project file] defineTest(addModule) { + for(d, $$list($$2 $$3)): \ + !contains(MODULES, $$d): \ + error("'$$1' depends on not (yet) declared '$$d'.") + MODULES += $$1 + export(MODULES) + contains(QT_SKIP_MODULES, $$1): return(false) !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$1): return(false) mod = $$moduleName($$1) -- cgit v1.2.3 From 1c04b1f7bdd6ead52f92011a6ac4bd4b8106abca Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Mon, 7 Dec 2015 15:46:21 +0200 Subject: Updated submodules. Change-Id: Ic83700e48f40b0ee8e76f4b4e44b28b4c85bebb7 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index c74ddf56..f6ff4023 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c74ddf562cf02ac2516db0c5f492cf7198a5e25a +Subproject commit f6ff4023e42bec8cfe088f27c17f7d309f0a9003 diff --git a/qtactiveqt b/qtactiveqt index 1fc0866f..ac734d1b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 1fc0866f4fc07b6ae503bdd24c6fe98d0714ed2a +Subproject commit ac734d1bf343d64d6df93589ce1d8c9a2f7dbe9c diff --git a/qtbase b/qtbase index 6302fb07..dae77465 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6302fb07e763a3a59458dab38445a22ba7833d7e +Subproject commit dae77465d1a96d7a6c4fd21e9cd92dc11d5ff68b diff --git a/qtconnectivity b/qtconnectivity index e117459e..0a9d4e32 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e117459e0d3d0670aa2cc60dfa3eafe81bbf11a9 +Subproject commit 0a9d4e32de60f31dac43973037ae7c546fb8cd6a diff --git a/qtdeclarative b/qtdeclarative index fe2e7b73..bb921064 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fe2e7b73402583e996c1fa05d78abd04a4d95b76 +Subproject commit bb921064b966efdaabc2245cad21c3d852848a22 diff --git a/qtdoc b/qtdoc index 60f415fc..23d7854f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 60f415fc7c793bc00b2b017583745fb426a9fdc4 +Subproject commit 23d7854f66ce5a37d0ce05a76a2c6350b0f6b81b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 5d458e1e..59699c93 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 5d458e1ef23274921295bfbc20bebf439643d1a2 +Subproject commit 59699c9322b3861e3d0251dfd40a65d0f03c76d4 diff --git a/qtlocation b/qtlocation index eea31518..e70502b1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eea315187d1add70aaf69745c031b8d6342b2303 +Subproject commit e70502b14a6b78067c18a4645570c077453c34ea diff --git a/qtmultimedia b/qtmultimedia index 1950765b..2b7c617e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1950765b655307fd138f4c48e54d8932c734fbee +Subproject commit 2b7c617e090f495bbf62c1257c822f5849c21742 diff --git a/qtqa b/qtqa index 2c352647..49975693 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 2c352647f6c8511fe5b44725bb068cc91e676106 +Subproject commit 499756938979a9aaca5e378abd06cb6d10ceeb65 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 87a4d340..c930f4ad 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 87a4d340ef2438f43cfc795bb27947b125b3d2cf +Subproject commit c930f4adf8dd0829c4d3a00d48b70ca988721033 diff --git a/qtsensors b/qtsensors index d8d4a5e9..c398c3a9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d8d4a5e9ac1251e82d1ec639bc3bff7e7f53c083 +Subproject commit c398c3a93edfdb3e4f9aa4fda7eb1c981333dd03 diff --git a/qtserialport b/qtserialport index 13fa77f5..5641fd99 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 13fa77f5cbbc7d5d717c3663512b904bba8c106c +Subproject commit 5641fd99e3c61291cf5562b5083e93678c5d6ab4 diff --git a/qttools b/qttools index 82b6bcae..83a197e1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 82b6bcaeb30c29e9152e97e6898414acba7d402f +Subproject commit 83a197e1d73d855360fd45d2172ba09bfc127f62 diff --git a/qtwebengine b/qtwebengine index e68d1ad0..991e32f2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e68d1ad06599eae1b0785263f3a0863701e6f1bc +Subproject commit 991e32f2fae311f32791df90d8e531e1cbd23c2f diff --git a/qtwebview b/qtwebview index 356c60f2..ba430289 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 356c60f2aaf7881f08a07aaf38bece8bbaa39d8d +Subproject commit ba4302894ecc511228b010ec49b9f865ea6ebe5a -- cgit v1.2.3 From d678e02936efe3bbb6d87442f7f096635e79786b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 9 Dec 2015 16:06:10 +0100 Subject: Updated submodules. Change-Id: Ia00cca2d8c22ff96a4f871d70eaa9eb55f6391b0 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index f6ff4023..94f3df1a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f6ff4023e42bec8cfe088f27c17f7d309f0a9003 +Subproject commit 94f3df1aacab5853d09e79596eb3bdae3aecae0a diff --git a/qtactiveqt b/qtactiveqt index ac734d1b..dd0feaa9 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ac734d1bf343d64d6df93589ce1d8c9a2f7dbe9c +Subproject commit dd0feaa95a4c3e186c18bab16db5552bb8efc2db diff --git a/qtbase b/qtbase index dae77465..3414be90 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dae77465d1a96d7a6c4fd21e9cd92dc11d5ff68b +Subproject commit 3414be909df60fa8a726c692b2a93f6b36a9c474 diff --git a/qtconnectivity b/qtconnectivity index 0a9d4e32..2402bb94 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0a9d4e32de60f31dac43973037ae7c546fb8cd6a +Subproject commit 2402bb9421ab8ba4479b7a4e9566b682146f70ff diff --git a/qtdeclarative b/qtdeclarative index bb921064..17705086 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bb921064b966efdaabc2245cad21c3d852848a22 +Subproject commit 177050862e644f9a279086b703cb04e06ea409b8 diff --git a/qtdoc b/qtdoc index 23d7854f..5f996b5e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 23d7854f66ce5a37d0ce05a76a2c6350b0f6b81b +Subproject commit 5f996b5e8abad7379a43a1e6158c228081a2e86d diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 59699c93..3f240169 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 59699c9322b3861e3d0251dfd40a65d0f03c76d4 +Subproject commit 3f240169388d2f3090cd5730e03df8d8ab670510 diff --git a/qtimageformats b/qtimageformats index 531c30ea..6730d70f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 531c30ea66d2b8fe517c89bed149a938e16332ec +Subproject commit 6730d70f001c9492d32a6a8e95c304a52d7ddc35 diff --git a/qtlocation b/qtlocation index e70502b1..fda281b8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e70502b14a6b78067c18a4645570c077453c34ea +Subproject commit fda281b81730d0d41af09170e732b3d70c4cfff1 diff --git a/qtmultimedia b/qtmultimedia index 2b7c617e..5916caae 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2b7c617e090f495bbf62c1257c822f5849c21742 +Subproject commit 5916caae7a043da4c5547725cccbbeb10d18e1f5 diff --git a/qtqa b/qtqa index 49975693..b8a34de3 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 499756938979a9aaca5e378abd06cb6d10ceeb65 +Subproject commit b8a34de3134ef24a8ad4937bc48365b0635e4431 diff --git a/qtquickcontrols b/qtquickcontrols index a3ba1a53..80cde7c7 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a3ba1a532f92a933141d4671ce644053a0cb6fea +Subproject commit 80cde7c7ca22511494ae6d32b2023fb1e92ede4d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c930f4ad..f2f9786e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c930f4adf8dd0829c4d3a00d48b70ca988721033 +Subproject commit f2f9786e6194725bf48ee3833b1fdf9603b74e69 diff --git a/qtwebengine b/qtwebengine index 991e32f2..1c09b16e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 991e32f2fae311f32791df90d8e531e1cbd23c2f +Subproject commit 1c09b16ebb88737682a5cd6ddc58f6d360b635af -- cgit v1.2.3 From a93760f957332f826383936f11026c273a2ab5a4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 15 Dec 2015 06:04:04 +0100 Subject: Updated submodules. Change-Id: Iba5d9c28367748258013888c93ab773eb05bb0ee Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 94f3df1a..dc6e9d02 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 94f3df1aacab5853d09e79596eb3bdae3aecae0a +Subproject commit dc6e9d02ac1a9030308f2cdf11f96d4d3612fd6d diff --git a/qtbase b/qtbase index 3414be90..adb914f4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3414be909df60fa8a726c692b2a93f6b36a9c474 +Subproject commit adb914f4b9b723099824fd51a09a9b30bed4ec6c diff --git a/qtconnectivity b/qtconnectivity index 2402bb94..cd81e43c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2402bb9421ab8ba4479b7a4e9566b682146f70ff +Subproject commit cd81e43c26ea998aa009ea452e5723059ded8595 diff --git a/qtdeclarative b/qtdeclarative index 17705086..5f96bc07 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 177050862e644f9a279086b703cb04e06ea409b8 +Subproject commit 5f96bc07389382d534934120301c2d1a89d24657 diff --git a/qtdoc b/qtdoc index 5f996b5e..91ca24d0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5f996b5e8abad7379a43a1e6158c228081a2e86d +Subproject commit 91ca24d0484ba1166fbd31e7f444346f65e5637b diff --git a/qtlocation b/qtlocation index fda281b8..d75c0469 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit fda281b81730d0d41af09170e732b3d70c4cfff1 +Subproject commit d75c0469c05809a4c6ff85a4c78784b397cbfcc0 diff --git a/qtmultimedia b/qtmultimedia index 5916caae..82e13516 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5916caae7a043da4c5547725cccbbeb10d18e1f5 +Subproject commit 82e135167a5d24f600f006480b78a59511ae5cb3 diff --git a/qtqa b/qtqa index b8a34de3..0ff6cfc3 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b8a34de3134ef24a8ad4937bc48365b0635e4431 +Subproject commit 0ff6cfc355378efdab53ea54fb493de22f1e950b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f2f9786e..d4df163a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f2f9786e6194725bf48ee3833b1fdf9603b74e69 +Subproject commit d4df163af0609340f8b4c006ee18daaff563053d diff --git a/qtserialport b/qtserialport index 5641fd99..bd3fb6cc 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 5641fd99e3c61291cf5562b5083e93678c5d6ab4 +Subproject commit bd3fb6cc346b3bdbb7a05131b912d450490fa5c8 diff --git a/qttools b/qttools index 83a197e1..58d1304e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 83a197e1d73d855360fd45d2172ba09bfc127f62 +Subproject commit 58d1304edb82a0a17ee39d259e56b930ca35ffcc diff --git a/qtwayland b/qtwayland index 4d3c3a08..f51de354 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4d3c3a08eba8d30805f18397c98e19ab9fd40722 +Subproject commit f51de354b14d5a25d7e32debe0d56b9fbed67a4f diff --git a/qtwebengine b/qtwebengine index 1c09b16e..d239b603 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1c09b16ebb88737682a5cd6ddc58f6d360b635af +Subproject commit d239b60313f798cf75a4e34a768d9f4a1fc8f92a diff --git a/qtwebview b/qtwebview index ba430289..7b6d9a4c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ba4302894ecc511228b010ec49b9f865ea6ebe5a +Subproject commit 7b6d9a4cba8a4470ee346de40f6f4855fc2b2854 diff --git a/qtxmlpatterns b/qtxmlpatterns index ee56885f..8ba61049 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit ee56885f52b63132bffafad1ccc8830a65d129fa +Subproject commit 8ba610490e2d93526c165584e2f52c7ae8e9edc0 -- cgit v1.2.3