From e39f4e8b4be5da3d549c740ba396576bff7f952d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 16 Sep 2013 19:32:58 +0300 Subject: Updated submodules. Change-Id: I770893c71b179aa87c1bf2d83318ba62c8c2aa96 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtjsbackend | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtbase b/qtbase index 99362fb7..edf1a570 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 99362fb7f25a88829c2d824ebfe6da61d4d7b35f +Subproject commit edf1a5706eebb6f2df14c5f524c7261f88d6cd75 diff --git a/qtdeclarative b/qtdeclarative index 0a29a82d..b01b2474 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0a29a82dfb04bafc8408e6d1843fde588b3d1b95 +Subproject commit b01b2474bb4c901a60a528c66f8b0ae8dd14e975 diff --git a/qtdoc b/qtdoc index a09b156a..c0ba30db 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a09b156a356c1932064d2bd74b497552bbb104c9 +Subproject commit c0ba30dbc25884ceb9312280620eeb7084ca7730 diff --git a/qtjsbackend b/qtjsbackend index 0a8af38c..a48ae1d6 160000 --- a/qtjsbackend +++ b/qtjsbackend @@ -1 +1 @@ -Subproject commit 0a8af38cf0add7592bf8f491e45a5de8b125a190 +Subproject commit a48ae1d629f4c7939f3421db969f43db6bab8e11 diff --git a/qtmultimedia b/qtmultimedia index 13a53a50..4715ec52 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 13a53a505640aebd2b10c0c52977650c797678ad +Subproject commit 4715ec52b17a220c48a380a2cd1619ad5fb069a7 diff --git a/qtqa b/qtqa index 04ac80df..a0b15c2a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 04ac80df296160858aef23145a71c74ccdaea9cc +Subproject commit a0b15c2ada1ed5b3ed721dad149e8b60e032dc03 diff --git a/qtquick1 b/qtquick1 index f9df0b99..27d22c5f 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit f9df0b99470f905289126f253ede978b611d6333 +Subproject commit 27d22c5f4201c7555b42e187252bee3fd88d3821 diff --git a/qtquickcontrols b/qtquickcontrols index c304d741..4eb34008 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c304d741a27b5822a35d1fb83f8f5e65719907ce +Subproject commit 4eb3400843cafcedffa47fb8a272704bca4e9473 diff --git a/qtrepotools b/qtrepotools index a5273ab7..1bc7799a 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a5273ab7d83aed8f8b74d8347631ec9888badef5 +Subproject commit 1bc7799a47a84786ba6d55615a8022ba8e6a4fd1 diff --git a/qtscript b/qtscript index fcac3316..1f8aa220 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit fcac33167b4194b91d3741c26593338fe5801af4 +Subproject commit 1f8aa220b50eb83205279441769fa697730b3e6f diff --git a/qtsensors b/qtsensors index 52c831db..ed96b2ea 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 52c831db165f5068826dddef4d41427a98a42dfd +Subproject commit ed96b2ea42bd95feeba1085665286a33c9672ab1 diff --git a/qtserialport b/qtserialport index fea1f603..6bd56edb 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit fea1f6030287b5499ed6d4922695e1f3b4ebc00a +Subproject commit 6bd56edb87f14074a15fde141d9d6f52d01de366 diff --git a/qttools b/qttools index 48f147c7..4d5b5c27 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 48f147c72c126cd82f4a4c028a8e55b8227db938 +Subproject commit 4d5b5c275835120eba080d47335c10daa12ab69f diff --git a/qttranslations b/qttranslations index 0aeadcb2..447b60c1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0aeadcb2d42e09809efc1833b83de406fcad47be +Subproject commit 447b60c1b7a6e50da1089f68f2cb12704edf6cd3 diff --git a/qtwebkit b/qtwebkit index e99cdcf1..6eecd106 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit e99cdcf1369fd54ea15079766b8a5b3d589fddc0 +Subproject commit 6eecd106312582cacbfce3085e5a7b0b82778c92 -- cgit v1.2.3 From 2f20faa052b66b7e85802368cd42447f09d8e321 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 26 Sep 2013 03:32:08 +0300 Subject: Updated submodules. Change-Id: Ie39f4e8b4be5da3d549c740ba396576bff7f952d Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qtbase b/qtbase index edf1a570..f04b46f3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit edf1a5706eebb6f2df14c5f524c7261f88d6cd75 +Subproject commit f04b46f34e9446417cd5681f511332344679ef30 diff --git a/qtconnectivity b/qtconnectivity index ac2edceb..efb67941 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ac2edceb02a61c1d670312385b1d709417961799 +Subproject commit efb67941585a82c190302af18d5b6350386ed7da diff --git a/qtdeclarative b/qtdeclarative index b01b2474..6752b6fe 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b01b2474bb4c901a60a528c66f8b0ae8dd14e975 +Subproject commit 6752b6fef66f24e326a2a58138de73d24809bc4a diff --git a/qtdoc b/qtdoc index c0ba30db..dd3ce034 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c0ba30dbc25884ceb9312280620eeb7084ca7730 +Subproject commit dd3ce034d6575c30b5152420a120881d4d66b30a diff --git a/qtlocation b/qtlocation index e0256ec2..a54ecd3d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e0256ec27512437421d8a63d9090e478b87af599 +Subproject commit a54ecd3d19c871461b77f8e0a01bb5c13fd9fca6 diff --git a/qtmultimedia b/qtmultimedia index 4715ec52..1918c7bf 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4715ec52b17a220c48a380a2cd1619ad5fb069a7 +Subproject commit 1918c7bfdfaef254c867d0b827b13a3793c6aa90 diff --git a/qtqa b/qtqa index a0b15c2a..556c9ffe 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a0b15c2ada1ed5b3ed721dad149e8b60e032dc03 +Subproject commit 556c9ffeeb3ed1b332b25905c9c381627e4ffe2a diff --git a/qtquick1 b/qtquick1 index 27d22c5f..31b10729 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 27d22c5f4201c7555b42e187252bee3fd88d3821 +Subproject commit 31b107298609928c0eaa2e974ade59ce9d815e2c diff --git a/qtquickcontrols b/qtquickcontrols index 4eb34008..4e92f2b1 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4eb3400843cafcedffa47fb8a272704bca4e9473 +Subproject commit 4e92f2b10a0e4d42e903f6a18b59b33919e238d9 diff --git a/qtrepotools b/qtrepotools index 1bc7799a..03a5e106 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 1bc7799a47a84786ba6d55615a8022ba8e6a4fd1 +Subproject commit 03a5e106d395d6a3cfa46fa9b1f60b387e1dece3 diff --git a/qtscript b/qtscript index 1f8aa220..eff4a0f3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 1f8aa220b50eb83205279441769fa697730b3e6f +Subproject commit eff4a0f3fca2e22d4be888cdd7953e1c2ab8c918 diff --git a/qtsensors b/qtsensors index ed96b2ea..fc3b8393 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ed96b2ea42bd95feeba1085665286a33c9672ab1 +Subproject commit fc3b83939b10b3d7189b2d230a31c1e5663ae2d6 diff --git a/qtserialport b/qtserialport index 6bd56edb..cae0bb18 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6bd56edb87f14074a15fde141d9d6f52d01de366 +Subproject commit cae0bb18e4fdb5fedb8bec0054ae1acfa101d22b diff --git a/qtsvg b/qtsvg index bfda4740..6a4cc0bc 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bfda474003a1776359003661f141567cfa37d0d5 +Subproject commit 6a4cc0bc6378866ec19e0dfb37e22c203b7b7154 diff --git a/qttools b/qttools index 4d5b5c27..99526b03 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4d5b5c275835120eba080d47335c10daa12ab69f +Subproject commit 99526b03f53ea648fea8ef5d8051febfd882ca38 diff --git a/qtwebkit b/qtwebkit index 6eecd106..6704d913 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 6eecd106312582cacbfce3085e5a7b0b82778c92 +Subproject commit 6704d913bde48a666f8e8a8a0cb737c0c49f581c diff --git a/qtwinextras b/qtwinextras index 0eade30f..48e14ce3 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 0eade30f37980c38b14d5cfa475837d15b69a8c5 +Subproject commit 48e14ce3ed6a269cec26c0b18df00617271936d9 diff --git a/qtxmlpatterns b/qtxmlpatterns index e925560b..e7a51b13 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e925560b37e148b468c2dcc5d6f163eb539df3e9 +Subproject commit e7a51b138772cb453555d27f44e6a2c0e79e799c -- cgit v1.2.3 From f3636c9757a216a357a7da20031c96f3aec15b8e Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 23 Sep 2013 12:46:45 +0200 Subject: Add qtmacextras#stable as part of the default modules Also updating the sha1 to the latest one that has passed the CI already. Change-Id: I88d803a738be59c377ef4c2315a855d2675331d4 Reviewed-by: Akseli Salovaara Reviewed-by: Gabriel de Dietrich --- init-repository | 1 + qtmacextras | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/init-repository b/init-repository index f662fb5c..8cb38238 100755 --- a/init-repository +++ b/init-repository @@ -242,6 +242,7 @@ my @DEFAULT_REPOS = qw( qtdoc qtgraphicaleffects qtimageformats + qtmacextras qtmultimedia qtqa qtquick1 diff --git a/qtmacextras b/qtmacextras index 1ef71fcd..ff3b658c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 1ef71fcdb15ac0b93751142629b4a2d1ab1e73c8 +Subproject commit ff3b658c771d8fbc17109ff5e0096ad1fe62f2e4 -- cgit v1.2.3 From 0d22f2d30d56cfdee7e3310ce1940c35b484e2a5 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 23 Sep 2013 12:51:56 +0200 Subject: Add new qtandroidextras repository Also adding it as part of the default modules. Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32 Reviewed-by: Christian Stromme --- .gitmodules | 3 +++ init-repository | 2 ++ qt.pro | 1 + qtandroidextras | 1 + 4 files changed, 7 insertions(+) create mode 160000 qtandroidextras diff --git a/.gitmodules b/.gitmodules index 027a1274..e8c071b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -97,3 +97,6 @@ [submodule "qtwinextras"] path = qtwinextras url = ../qtwinextras.git +[submodule "qtandroidextras"] + path = qtandroidextras + url = ../qtandroidextras.git diff --git a/init-repository b/init-repository index 8cb38238..819e98f1 100755 --- a/init-repository +++ b/init-repository @@ -202,6 +202,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qt5 qlalr qtactiveqt + qtandroidextras qtbase qtconnectivity qtdeclarative @@ -236,6 +237,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( my @DEFAULT_REPOS = qw( qtactiveqt + qtandroidextras qtbase qtconnectivity qtdeclarative diff --git a/qt.pro b/qt.pro index 724967dd..5b80d163 100644 --- a/qt.pro +++ b/qt.pro @@ -54,6 +54,7 @@ defineTest(addModule) { # it may not build. addModule(qtbase) +addModule(qtandroidextras, qtbase) addModule(qtmacextras, qtbase) addModule(qtx11extras, qtbase) addModule(qlalr, qtbase) diff --git a/qtandroidextras b/qtandroidextras new file mode 160000 index 00000000..6500083c --- /dev/null +++ b/qtandroidextras @@ -0,0 +1 @@ +Subproject commit 6500083ceb9c9e63eb5ff544e91aa9d556c6739f -- cgit v1.2.3 From e937791dcbe07d65728ab2cea1d590ab1eec8922 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 7 Oct 2013 03:33:01 +0300 Subject: Updated submodules. Change-Id: I2f20faa052b66b7e85802368cd42447f09d8e321 Reviewed-by: Sergio Ahumada --- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 6500083c..98ebfd8d 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 6500083ceb9c9e63eb5ff544e91aa9d556c6739f +Subproject commit 98ebfd8d34073679247e6ad77d8f34a0cbfc3124 diff --git a/qtbase b/qtbase index f04b46f3..d5e62f81 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f04b46f34e9446417cd5681f511332344679ef30 +Subproject commit d5e62f81691403560be9763233d1ade0c7de9aec diff --git a/qtconnectivity b/qtconnectivity index efb67941..c14977cc 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit efb67941585a82c190302af18d5b6350386ed7da +Subproject commit c14977cc806227bc546043c0d16ede21b856e830 diff --git a/qtdeclarative b/qtdeclarative index 6752b6fe..d108aeac 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6752b6fef66f24e326a2a58138de73d24809bc4a +Subproject commit d108aeacac4835758e3e5f605b4845958ac82825 diff --git a/qtdoc b/qtdoc index dd3ce034..91ebc397 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dd3ce034d6575c30b5152420a120881d4d66b30a +Subproject commit 91ebc39776a9fc0ebe66bc112d35604b154e5325 diff --git a/qtlocation b/qtlocation index a54ecd3d..f01f3bc1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a54ecd3d19c871461b77f8e0a01bb5c13fd9fca6 +Subproject commit f01f3bc181f579680867b9dd9a71f52f71c8ee83 diff --git a/qtmacextras b/qtmacextras index ff3b658c..916bf337 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ff3b658c771d8fbc17109ff5e0096ad1fe62f2e4 +Subproject commit 916bf33706a43a9a3451623fbd44f2f43cdd401e diff --git a/qtmultimedia b/qtmultimedia index 1918c7bf..3793b065 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1918c7bfdfaef254c867d0b827b13a3793c6aa90 +Subproject commit 3793b0653f4127e8f84808419b05115a66c3bc03 diff --git a/qtqa b/qtqa index 556c9ffe..3462a2d1 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 556c9ffeeb3ed1b332b25905c9c381627e4ffe2a +Subproject commit 3462a2d1ddbebbe10d4868d85021877d33f80999 diff --git a/qtquick1 b/qtquick1 index 31b10729..24fb923e 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 31b107298609928c0eaa2e974ade59ce9d815e2c +Subproject commit 24fb923ef697d91618e15ee0c66dd5b0d0a22579 diff --git a/qtquickcontrols b/qtquickcontrols index 4e92f2b1..ef44b8c0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4e92f2b10a0e4d42e903f6a18b59b33919e238d9 +Subproject commit ef44b8c03c4dfe7366218a7ae813ba7bee4e9852 diff --git a/qtrepotools b/qtrepotools index 03a5e106..bf082630 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 03a5e106d395d6a3cfa46fa9b1f60b387e1dece3 +Subproject commit bf0826302cf53330f79aa932d00abd6776e5e23f diff --git a/qtscript b/qtscript index eff4a0f3..421ee46b 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit eff4a0f3fca2e22d4be888cdd7953e1c2ab8c918 +Subproject commit 421ee46b982d274fe7e7a2f7a4269e39134d31d2 diff --git a/qtsensors b/qtsensors index fc3b8393..e4ff5873 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit fc3b83939b10b3d7189b2d230a31c1e5663ae2d6 +Subproject commit e4ff58731699e1202396f9ef5863f462fa1d9456 diff --git a/qtserialport b/qtserialport index cae0bb18..6e03505a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit cae0bb18e4fdb5fedb8bec0054ae1acfa101d22b +Subproject commit 6e03505a1a2b6ce6e5dc1a5ee28c084ef4692380 diff --git a/qttools b/qttools index 99526b03..6399d3a8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 99526b03f53ea648fea8ef5d8051febfd882ca38 +Subproject commit 6399d3a8349859f423c225c5fa8fd9231deeb9a2 diff --git a/qtwebkit b/qtwebkit index 6704d913..85378c35 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 6704d913bde48a666f8e8a8a0cb737c0c49f581c +Subproject commit 85378c35d6b0a31737f58025945da6dc61bba405 diff --git a/qtwinextras b/qtwinextras index 48e14ce3..a8699963 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 48e14ce3ed6a269cec26c0b18df00617271936d9 +Subproject commit a8699963b98fe2d1dcc33658ac006100b69444b1 diff --git a/qtx11extras b/qtx11extras index 8aaf6a30..f0e400e1 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 8aaf6a3070b2ff1cab1fa79a79fb16e2768e1e53 +Subproject commit f0e400e1bca13176e56cf7bb323cd0a6393a85ea diff --git a/qtxmlpatterns b/qtxmlpatterns index e7a51b13..3c63cedb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e7a51b138772cb453555d27f44e6a2c0e79e799c +Subproject commit 3c63cedb5d3defd831eb2d8bfdeb883121737ef3 -- cgit v1.2.3 From bf0bfeb991202715c434ca28e57f56d64a861e53 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 7 Oct 2013 10:27:10 +0200 Subject: Mark qtmultimedia as an optional dependency for qtwinextras The QtWinExtras Music Player example uses QtMultimedia. Change-Id: Ib720710a8563d6bfa39aec8b82e9a87517b7e015 Reviewed-by: Mandeep Sandhu Reviewed-by: Friedemann Kleint Reviewed-by: Sergio Ahumada --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index 5b80d163..380e06a6 100644 --- a/qt.pro +++ b/qt.pro @@ -61,9 +61,9 @@ addModule(qlalr, qtbase) addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns) -addModule(qtwinextras, qtbase, qtdeclarative) addModule(qtquickcontrols, qtdeclarative) addModule(qtmultimedia, qtdeclarative) +addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia) addModule(qtactiveqt, qtbase) addModule(qt3d, qtdeclarative) addModule(qtjsondb, qtdeclarative) -- cgit v1.2.3 From 7f523a7aa3a00d2190cbe7ca4c52a9a30cb67ea0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Oct 2013 11:32:57 +0300 Subject: Updated submodules. Change-Id: Ie937791dcbe07d65728ab2cea1d590ab1eec8922 Reviewed-by: Sergio Ahumada --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qttools | 2 +- qtwinextras | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index b29d07c5..de09a6dc 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b29d07c554e5beed0e88b8d75fc42b40b77fee6c +Subproject commit de09a6dc2ba4de8b0d363e664c268a23c4e92b75 diff --git a/qtbase b/qtbase index d5e62f81..ef7284a1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d5e62f81691403560be9763233d1ade0c7de9aec +Subproject commit ef7284a1484a7b43470efc1cb0815764260c3c12 diff --git a/qtdeclarative b/qtdeclarative index d108aeac..48e32cfa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d108aeacac4835758e3e5f605b4845958ac82825 +Subproject commit 48e32cfabed8527ac788142393226ad931d29420 diff --git a/qtdoc b/qtdoc index 91ebc397..b0addfdd 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 91ebc39776a9fc0ebe66bc112d35604b154e5325 +Subproject commit b0addfddcd1a87811d51e82aadc4a18fb20bbbb4 diff --git a/qtimageformats b/qtimageformats index 82b7b9d3..701ba023 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 82b7b9d3dc9e1eeff305a3e53e618d3413be123d +Subproject commit 701ba023a2d047ef27befc800c428b1dbcf13cff diff --git a/qtlocation b/qtlocation index f01f3bc1..32cb5bce 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f01f3bc181f579680867b9dd9a71f52f71c8ee83 +Subproject commit 32cb5bcec7a63c9c9f858cca950693b789ddba8c diff --git a/qtqa b/qtqa index 3462a2d1..54dce5d6 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3462a2d1ddbebbe10d4868d85021877d33f80999 +Subproject commit 54dce5d63de2ae6987c49d7ed8c4331066d9f34c diff --git a/qttools b/qttools index 6399d3a8..33d90d97 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6399d3a8349859f423c225c5fa8fd9231deeb9a2 +Subproject commit 33d90d97d936d0e32ffe0a07b3a7809f67e0e70c diff --git a/qtwinextras b/qtwinextras index a8699963..118a4f14 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit a8699963b98fe2d1dcc33658ac006100b69444b1 +Subproject commit 118a4f143b9125f02a11d2c579cced4e37fb9d70 -- cgit v1.2.3 From bc6bcaa32348e62842509990c3a258dd07b15b0a Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 24 Sep 2013 16:26:03 +0200 Subject: qt.pro: Fix dependencies for qtconnectivity Remove the hard dependency on qtsystems and changing it with a hard dependency on qtbase and a optional dependency on qtdeclarative instead. Change-Id: I96a4d3b38df588489e5ff4a704ea1e4fcbdb620c Reviewed-by: Alex Blasche --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index 380e06a6..b92b3c69 100644 --- a/qt.pro +++ b/qt.pro @@ -70,7 +70,7 @@ addModule(qtjsondb, qtdeclarative) addModule(qtsystems, qtbase, qtdeclarative) addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia) addModule(qtsensors, qtbase, qtdeclarative) -addModule(qtconnectivity, qtsystems) +addModule(qtconnectivity, qtbase, qtdeclarative) addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative, qtjsondb) addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro) -- cgit v1.2.3 From f09783bb8026e686e6a29e575491b557f810f4a6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 30 Sep 2013 18:17:00 +0200 Subject: move changelog entry before the real footers the change-id will be added at the end, which will look just plain stupid if the other "real" footers come above the changelog. also, a smart log author would integrate the changelog entry into the flow of the message, so further up in the template is more natural. Change-Id: I053840a81ea62f2e0ad1bd133f2e7a2692a6f2d6 Reviewed-by: Frederik Gladhorn Reviewed-by: Thiago Macieira --- .commit-template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.commit-template b/.commit-template index b7c00b82..0aef528f 100644 --- a/.commit-template +++ b/.commit-template @@ -6,15 +6,15 @@ # ==[ Footers: Uncomment and edit where applicable ]===================| # +# Change log entry (see below for instructions). +#[ChangeLog][][] +# # One task per entry. Remember space after colon. #Task-number: # # Solicit reviewers. They still need to use the Gerrit frontend. #Reviewed-by: # -# Change log entry (see below for instructions). -#[ChangeLog][][] -# # ==[ Please wrap at 72 characters ]===================================| # # Remember to read http://wiki.qt-project.org/Commit_Policy -- cgit v1.2.3 From 728cd2e1737544c6236c9c9acfb502381c598149 Mon Sep 17 00:00:00 2001 From: Mandeep Sandhu Date: Mon, 16 Sep 2013 16:43:33 +0530 Subject: Ignore auto-generated file .qmake.super Added rule in .gitignore for .qmake.super. This file is generated when building Qt from the root dir. Task-number: QTBUG-33439 Change-Id: Ic15b10e9c7cb175f2ff102f75d08110acf13a0cd Reviewed-by: Oswald Buddenhagen --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7bd3d3d6..d5a0a45c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Makefile .qmake.cache +.qmake.super -- cgit v1.2.3 From f9a5d1941655bd5cceaa7ded5893fea3206c5bea Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 12 Oct 2013 19:33:01 +0300 Subject: Updated submodules. Change-Id: I7f523a7aa3a00d2190cbe7ca4c52a9a30cb67ea0 Reviewed-by: Simon Hausmann --- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 98ebfd8d..ca82c060 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 98ebfd8d34073679247e6ad77d8f34a0cbfc3124 +Subproject commit ca82c060451d38f266fc17305855c57e7c8c0f51 diff --git a/qtbase b/qtbase index ef7284a1..64332372 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ef7284a1484a7b43470efc1cb0815764260c3c12 +Subproject commit 64332372a133d4c37d3ca8d85c04427386c35300 diff --git a/qtconnectivity b/qtconnectivity index c14977cc..87debe43 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c14977cc806227bc546043c0d16ede21b856e830 +Subproject commit 87debe438c3655081f2b56bceea1ca7b045e28a5 diff --git a/qtdeclarative b/qtdeclarative index 48e32cfa..41b027c3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 48e32cfabed8527ac788142393226ad931d29420 +Subproject commit 41b027c3992483b29940a8cc891ead8d35cec966 diff --git a/qtdoc b/qtdoc index b0addfdd..33b53eee 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b0addfddcd1a87811d51e82aadc4a18fb20bbbb4 +Subproject commit 33b53eee1dce1f42aedfe38e2e28dfa9ce0d2d7c diff --git a/qtlocation b/qtlocation index 32cb5bce..e200f05b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 32cb5bcec7a63c9c9f858cca950693b789ddba8c +Subproject commit e200f05bc75d8f19df624bc3849d9c5bbf096873 diff --git a/qtmultimedia b/qtmultimedia index 3793b065..6f0cdc26 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3793b0653f4127e8f84808419b05115a66c3bc03 +Subproject commit 6f0cdc264f58d2c3b7109050d8d5799143bae34d diff --git a/qtquickcontrols b/qtquickcontrols index ef44b8c0..d60ab496 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ef44b8c03c4dfe7366218a7ae813ba7bee4e9852 +Subproject commit d60ab496e4daceaa82938fa07f9e89dbc9c102c3 diff --git a/qtscript b/qtscript index 421ee46b..1deb9e76 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 421ee46b982d274fe7e7a2f7a4269e39134d31d2 +Subproject commit 1deb9e76e6f8dd85e974913ac3234f89dd4925c8 diff --git a/qtserialport b/qtserialport index 6e03505a..00422cd2 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6e03505a1a2b6ce6e5dc1a5ee28c084ef4692380 +Subproject commit 00422cd2b723a9704ea3b705dd4fda5fa70723a6 diff --git a/qttools b/qttools index 33d90d97..7eb26338 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 33d90d97d936d0e32ffe0a07b3a7809f67e0e70c +Subproject commit 7eb2633822ff6abb74ba4f83ffc88245e788720b diff --git a/qtwebkit b/qtwebkit index 85378c35..73ca371c 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 85378c35d6b0a31737f58025945da6dc61bba405 +Subproject commit 73ca371cd6217c8dec955d5b56bf74af4b4499c8 diff --git a/qtwebkit-examples b/qtwebkit-examples index ca7d7a45..89a33307 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit ca7d7a458b2dda46b69358255b1b2c0e587a7290 +Subproject commit 89a3330783ba1b16fca2a27a99e090a458fbd0a9 diff --git a/qtwinextras b/qtwinextras index 118a4f14..429abebf 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 118a4f143b9125f02a11d2c579cced4e37fb9d70 +Subproject commit 429abebf7728d073b93a5726297ee8673cc38bd1 diff --git a/qtxmlpatterns b/qtxmlpatterns index 3c63cedb..1fd8af1c 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 3c63cedb5d3defd831eb2d8bfdeb883121737ef3 +Subproject commit 1fd8af1c9e6bca1180f2193aa26d1d01df817395 -- cgit v1.2.3