From cb2d850b479fed9fed3c4a9fea698f924be942ef Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 Oct 2013 22:00:06 +0300 Subject: Updated submodules. Change-Id: If9a5d1941655bd5cceaa7ded5893fea3206c5bea Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebkit | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index 64332372..b5d01a9d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 64332372a133d4c37d3ca8d85c04427386c35300 +Subproject commit b5d01a9dfc42c4da7aec7123b9839de52b8335ff diff --git a/qtconnectivity b/qtconnectivity index 87debe43..d5aa60fd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 87debe438c3655081f2b56bceea1ca7b045e28a5 +Subproject commit d5aa60fd33be47dd9ae1ad49c71d3edf059229bd diff --git a/qtdeclarative b/qtdeclarative index 41b027c3..e6652d89 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 41b027c3992483b29940a8cc891ead8d35cec966 +Subproject commit e6652d89578081a5a2f1cc22db68696c4c213421 diff --git a/qtdoc b/qtdoc index 33b53eee..6eb09aa1 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 33b53eee1dce1f42aedfe38e2e28dfa9ce0d2d7c +Subproject commit 6eb09aa1fd861c309ccce3964d3f268b4565b9c0 diff --git a/qtlocation b/qtlocation index e200f05b..0786326d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e200f05bc75d8f19df624bc3849d9c5bbf096873 +Subproject commit 0786326dd8cd53a89236da581bdeaf79f967713a diff --git a/qtmultimedia b/qtmultimedia index 6f0cdc26..98a6eefd 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6f0cdc264f58d2c3b7109050d8d5799143bae34d +Subproject commit 98a6eefda90926e2fb862600cf319cd701b057b5 diff --git a/qtqa b/qtqa index 54dce5d6..134f1f4d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 54dce5d63de2ae6987c49d7ed8c4331066d9f34c +Subproject commit 134f1f4dc0c1b31c4a6fc25a2437c7973a0003a3 diff --git a/qtquickcontrols b/qtquickcontrols index d60ab496..d9af37c1 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d60ab496e4daceaa82938fa07f9e89dbc9c102c3 +Subproject commit d9af37c1456e3678094b18715b1dae382aa78ee0 diff --git a/qttools b/qttools index 7eb26338..9327c9aa 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7eb2633822ff6abb74ba4f83ffc88245e788720b +Subproject commit 9327c9aa7925cb2175b5481f39e48ef487da32cf diff --git a/qtwebkit b/qtwebkit index 73ca371c..7082885c 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 73ca371cd6217c8dec955d5b56bf74af4b4499c8 +Subproject commit 7082885c6cbe5fd293a8fd647166b9c46a20b815 -- cgit v1.2.3 From 7e2e8cad6636584f1d3fc9d213363e5fc6243ef2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 16 Oct 2013 17:15:33 +0300 Subject: Updated submodules. Change-Id: Icb2d850b479fed9fed3c4a9fea698f924be942ef Reviewed-by: Sergio Ahumada --- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qttranslations | 2 +- qtwebkit | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index ca82c060..c1d9cc68 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit ca82c060451d38f266fc17305855c57e7c8c0f51 +Subproject commit c1d9cc68c7a70fe3a61a0b21b57bf4afd990e564 diff --git a/qtbase b/qtbase index b5d01a9d..1f01ac83 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b5d01a9dfc42c4da7aec7123b9839de52b8335ff +Subproject commit 1f01ac832346fb217e7c07452673cd5f66cf4835 diff --git a/qtdeclarative b/qtdeclarative index e6652d89..ddd9c93b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e6652d89578081a5a2f1cc22db68696c4c213421 +Subproject commit ddd9c93b084c5168d7b12396450125e7a0929c28 diff --git a/qtdoc b/qtdoc index 6eb09aa1..b6c710a3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6eb09aa1fd861c309ccce3964d3f268b4565b9c0 +Subproject commit b6c710a3ec92c81966b2444ffc12aaac8877b74e diff --git a/qtlocation b/qtlocation index 0786326d..b7a585eb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0786326dd8cd53a89236da581bdeaf79f967713a +Subproject commit b7a585ebd57f85c89ee20eda5b1a06819b3e1af0 diff --git a/qtmultimedia b/qtmultimedia index 98a6eefd..06816952 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 98a6eefda90926e2fb862600cf319cd701b057b5 +Subproject commit 068169528c5e8a281b448c21d6eb5dbd88911dc0 diff --git a/qtquickcontrols b/qtquickcontrols index d9af37c1..32409d98 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d9af37c1456e3678094b18715b1dae382aa78ee0 +Subproject commit 32409d98b5c1751f4954a8e0c4035fe0c62cffcf diff --git a/qttranslations b/qttranslations index 447b60c1..8e663f0d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 447b60c1b7a6e50da1089f68f2cb12704edf6cd3 +Subproject commit 8e663f0d05ffde8030873496512b851bbbab80b6 diff --git a/qtwebkit b/qtwebkit index 7082885c..332de746 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 7082885c6cbe5fd293a8fd647166b9c46a20b815 +Subproject commit 332de746f32edbb3dfc1cd4b39d8c815fd47b28e -- cgit v1.2.3 From c1160960655acf260a4ab47d9caea3b271a09bf6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 22 Oct 2013 03:32:41 +0300 Subject: Updated submodules. Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2 Reviewed-by: Iikka Eklund --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebkit | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 1f01ac83..690cf426 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1f01ac832346fb217e7c07452673cd5f66cf4835 +Subproject commit 690cf426f3a8c18d903e61228f65fa3b9e2a69d3 diff --git a/qtconnectivity b/qtconnectivity index d5aa60fd..782a09be 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d5aa60fd33be47dd9ae1ad49c71d3edf059229bd +Subproject commit 782a09be7c89352b27083bca7ee5b032d9e56ca6 diff --git a/qtdeclarative b/qtdeclarative index ddd9c93b..9de3630a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ddd9c93b084c5168d7b12396450125e7a0929c28 +Subproject commit 9de3630a513aa598855f7d40461c5aec9ecce319 diff --git a/qtdoc b/qtdoc index b6c710a3..a9e2b45e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b6c710a3ec92c81966b2444ffc12aaac8877b74e +Subproject commit a9e2b45e56942a10c2eb4d8b9be201716a9f4946 diff --git a/qtlocation b/qtlocation index b7a585eb..654b01af 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b7a585ebd57f85c89ee20eda5b1a06819b3e1af0 +Subproject commit 654b01af941ec620ca8a9b98be8542dda862d4a8 diff --git a/qtmultimedia b/qtmultimedia index 06816952..d7dd22b9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 068169528c5e8a281b448c21d6eb5dbd88911dc0 +Subproject commit d7dd22b9955ffde6d3c663655d9f9d4a58ca3894 diff --git a/qtquick1 b/qtquick1 index 24fb923e..52d8b58c 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 24fb923ef697d91618e15ee0c66dd5b0d0a22579 +Subproject commit 52d8b58c05aa234848c94758d6beddc0a793e6b4 diff --git a/qtquickcontrols b/qtquickcontrols index 32409d98..6b3e530f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 32409d98b5c1751f4954a8e0c4035fe0c62cffcf +Subproject commit 6b3e530f97b555a1746042480fea8d803e8bb301 diff --git a/qtserialport b/qtserialport index 00422cd2..c8b53127 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 00422cd2b723a9704ea3b705dd4fda5fa70723a6 +Subproject commit c8b53127b15f45c6d529bff7438a56f81a4ea032 diff --git a/qttools b/qttools index 9327c9aa..84700da0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9327c9aa7925cb2175b5481f39e48ef487da32cf +Subproject commit 84700da068430a781cb5beb94e1768a02d9ce9b5 diff --git a/qtwebkit b/qtwebkit index 332de746..2761751e 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 332de746f32edbb3dfc1cd4b39d8c815fd47b28e +Subproject commit 2761751ecaf61064c3742c639a37f110120e8292 -- cgit v1.2.3 From 758d922716ebdedeaa6fa26369c8dbb9dff4bae4 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 21 Oct 2013 17:30:39 +0200 Subject: Refine qt-module dependencies for massively parallel builds QtWebKit should be build after QtMultimedia for multimedia support on Mac and Windows. QtScript should be build after QtTools because an example uses UiTools. Change-Id: Id92efac72d8c2c2237f21fad1ab823c1c1ac95dd Reviewed-by: Oswald Buddenhagen --- qt.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qt.pro b/qt.pro index b92b3c69..d374afc6 100644 --- a/qt.pro +++ b/qt.pro @@ -73,13 +73,13 @@ addModule(qtsensors, qtbase, qtdeclarative) addModule(qtconnectivity, qtbase, qtdeclarative) addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative, qtjsondb) -addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro) +addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro) addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) addModule(qtwebkit-examples, qtwebkit qttools) addModule(qtimageformats, qtbase) addModule(qtgraphicaleffects, qtdeclarative) -addModule(qtscript, qtbase) -addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) +addModule(qtscript, qtbase, qttools) +addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit) addModule(qtdocgallery, qtdeclarative, qtjsondb) !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialport, qtbase) -- cgit v1.2.3 From 8b4022260b5b1d1016979086d0fe7eeba44f8883 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 Oct 2013 03:32:29 +0200 Subject: Updated submodules. Change-Id: Ic1160960655acf260a4ab47d9caea3b271a09bf6 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 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/qtactiveqt b/qtactiveqt index de09a6dc..71fc1260 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit de09a6dc2ba4de8b0d363e664c268a23c4e92b75 +Subproject commit 71fc1260391c1d30fa3e98be254dc7c0b50e4612 diff --git a/qtandroidextras b/qtandroidextras index c1d9cc68..df30d677 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c1d9cc68c7a70fe3a61a0b21b57bf4afd990e564 +Subproject commit df30d6777be1ede1cd1b529341c96ed40aa34b37 diff --git a/qtbase b/qtbase index 690cf426..fe220f3b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 690cf426f3a8c18d903e61228f65fa3b9e2a69d3 +Subproject commit fe220f3b5b6dcc5b98ce35684e9408c0fc669ddd diff --git a/qtdeclarative b/qtdeclarative index 9de3630a..2c750b45 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9de3630a513aa598855f7d40461c5aec9ecce319 +Subproject commit 2c750b45709fa164b758c5ec9e0e9ee744c51555 diff --git a/qtdoc b/qtdoc index a9e2b45e..acda541b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a9e2b45e56942a10c2eb4d8b9be201716a9f4946 +Subproject commit acda541be45faa8a2f47562f46208f1881d18462 diff --git a/qtlocation b/qtlocation index 654b01af..725beb50 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 654b01af941ec620ca8a9b98be8542dda862d4a8 +Subproject commit 725beb507ac41b05f306a058c5e9a764b647688c diff --git a/qtmacextras b/qtmacextras index 916bf337..fe4f9e5a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 916bf33706a43a9a3451623fbd44f2f43cdd401e +Subproject commit fe4f9e5a04188eb30950053c7df0f63dfeb52b0e diff --git a/qtmultimedia b/qtmultimedia index d7dd22b9..852f6849 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d7dd22b9955ffde6d3c663655d9f9d4a58ca3894 +Subproject commit 852f684973807531d16133815f4ed535ea3011dc diff --git a/qtqa b/qtqa index 134f1f4d..50d9961b 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 134f1f4dc0c1b31c4a6fc25a2437c7973a0003a3 +Subproject commit 50d9961bc34bcf6a95e14db7d8e1f2fa77098225 diff --git a/qtquickcontrols b/qtquickcontrols index 6b3e530f..6c5bcbf2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 6b3e530f97b555a1746042480fea8d803e8bb301 +Subproject commit 6c5bcbf23928094338da90be2cd4a2787104cf03 diff --git a/qtscript b/qtscript index 1deb9e76..24d678ce 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 1deb9e76e6f8dd85e974913ac3234f89dd4925c8 +Subproject commit 24d678ce9c3996f46d1069c2b1193e7ec1083fc8 diff --git a/qtsensors b/qtsensors index e4ff5873..243064b1 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e4ff58731699e1202396f9ef5863f462fa1d9456 +Subproject commit 243064b1226e08943b1bf4103f555202c2cfe3bf diff --git a/qtserialport b/qtserialport index c8b53127..e2fb29e3 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c8b53127b15f45c6d529bff7438a56f81a4ea032 +Subproject commit e2fb29e3c1462c42f11fc9f6a0ee0bb21a1eaee9 diff --git a/qtsvg b/qtsvg index 6a4cc0bc..2af7e73f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6a4cc0bc6378866ec19e0dfb37e22c203b7b7154 +Subproject commit 2af7e73f7e0335d28bb3de7c985a7305aba36a5e diff --git a/qttools b/qttools index 84700da0..093e82d8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 84700da068430a781cb5beb94e1768a02d9ce9b5 +Subproject commit 093e82d8af2442ad3b6e3f1b01dfe76f9d0b2e95 diff --git a/qtwebkit b/qtwebkit index 2761751e..419af543 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 2761751ecaf61064c3742c639a37f110120e8292 +Subproject commit 419af543220d35454b4e47ee09805b90b5f5926f diff --git a/qtwinextras b/qtwinextras index 429abebf..516e6f09 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 429abebf7728d073b93a5726297ee8673cc38bd1 +Subproject commit 516e6f09375d72088147724fad2acbd762805469 diff --git a/qtxmlpatterns b/qtxmlpatterns index 1fd8af1c..5f2a2e71 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1fd8af1c9e6bca1180f2193aa26d1d01df817395 +Subproject commit 5f2a2e71eea5daa9ec67db1ca6904762f8bf2b49 -- cgit v1.2.3 From 08e6aa58fbddc3b18407593ef1fd6886b20370a0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 Oct 2013 19:32:18 +0200 Subject: Updated submodules. Change-Id: I8b4022260b5b1d1016979086d0fe7eeba44f8883 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qtwebkit | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index fe220f3b..33a88d6c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fe220f3b5b6dcc5b98ce35684e9408c0fc669ddd +Subproject commit 33a88d6cd71691dd2fe616d65a3f303d2e683420 diff --git a/qtdeclarative b/qtdeclarative index 2c750b45..c7a3089c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2c750b45709fa164b758c5ec9e0e9ee744c51555 +Subproject commit c7a3089c146d6063f3b3201149e42c720c8ca5b3 diff --git a/qtdoc b/qtdoc index acda541b..9735e175 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit acda541be45faa8a2f47562f46208f1881d18462 +Subproject commit 9735e1750f94b3229933fb1118b3ebdc876ede14 diff --git a/qtmultimedia b/qtmultimedia index 852f6849..4edc0cc3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 852f684973807531d16133815f4ed535ea3011dc +Subproject commit 4edc0cc3b9d7e56e59eab64d0576e8fd511c27c4 diff --git a/qtquickcontrols b/qtquickcontrols index 6c5bcbf2..bd9ade60 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 6c5bcbf23928094338da90be2cd4a2787104cf03 +Subproject commit bd9ade606c1936ecb620dce857921920b828a234 diff --git a/qtrepotools b/qtrepotools index bf082630..f4a89118 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit bf0826302cf53330f79aa932d00abd6776e5e23f +Subproject commit f4a8911813ab5649ee26d6502587cbf279f32a1c diff --git a/qtserialport b/qtserialport index e2fb29e3..9181a898 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e2fb29e3c1462c42f11fc9f6a0ee0bb21a1eaee9 +Subproject commit 9181a898650158cd73f14edf105ee6d5b12eb7f7 diff --git a/qtwebkit b/qtwebkit index 419af543..a3e3255b 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 419af543220d35454b4e47ee09805b90b5f5926f +Subproject commit a3e3255b640a705a720e6844b4b2a2efd431b888 -- cgit v1.2.3 From 5987a236d059243d05d411cdc9f0193448a006ab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 1 Nov 2013 03:32:29 +0200 Subject: Updated submodules. Change-Id: I08e6aa58fbddc3b18407593ef1fd6886b20370a0 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebkit | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 71fc1260..83ff3215 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 71fc1260391c1d30fa3e98be254dc7c0b50e4612 +Subproject commit 83ff3215343b253b9edbf2c523b077ff9d206d5b diff --git a/qtbase b/qtbase index 33a88d6c..cfa85c76 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 33a88d6cd71691dd2fe616d65a3f303d2e683420 +Subproject commit cfa85c76c7c7e1622cb02edcbbc3d948edca1e7f diff --git a/qtconnectivity b/qtconnectivity index 782a09be..7c050660 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 782a09be7c89352b27083bca7ee5b032d9e56ca6 +Subproject commit 7c050660daf2460465ccd27e27cc31bebd71a83c diff --git a/qtdeclarative b/qtdeclarative index c7a3089c..bbc36ebb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c7a3089c146d6063f3b3201149e42c720c8ca5b3 +Subproject commit bbc36ebbc38de276b85947b65d89897bf430add5 diff --git a/qtmultimedia b/qtmultimedia index 4edc0cc3..ac01ab65 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4edc0cc3b9d7e56e59eab64d0576e8fd511c27c4 +Subproject commit ac01ab654356435b6db1c8adbf087b4aed3ffc0a diff --git a/qtquick1 b/qtquick1 index 52d8b58c..c282e56d 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 52d8b58c05aa234848c94758d6beddc0a793e6b4 +Subproject commit c282e56d3250a32b4458c892f0dbb3159f079028 diff --git a/qtquickcontrols b/qtquickcontrols index bd9ade60..792bb911 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit bd9ade606c1936ecb620dce857921920b828a234 +Subproject commit 792bb911bb5a2af6f00b3d32c654579a700257c6 diff --git a/qttools b/qttools index 093e82d8..6c324f9f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 093e82d8af2442ad3b6e3f1b01dfe76f9d0b2e95 +Subproject commit 6c324f9f6c8a6bf66b994e1c3730ee7f6a494643 diff --git a/qtwebkit b/qtwebkit index a3e3255b..1511044e 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit a3e3255b640a705a720e6844b4b2a2efd431b888 +Subproject commit 1511044e718c7f2cefcae08fe0d8748afd763ca8 -- cgit v1.2.3 From cf08b0d1091451f1762bbef7981cb1d9475f53b2 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 24 Oct 2013 12:30:47 +0200 Subject: Add qtenginio as submodule Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338 Reviewed-by: Oswald Buddenhagen --- .gitmodules | 3 +++ init-repository | 1 + qt.pro | 1 + qtenginio | 1 + 4 files changed, 6 insertions(+) create mode 160000 qtenginio diff --git a/.gitmodules b/.gitmodules index e8c071b9..4a1c3d05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -100,3 +100,6 @@ [submodule "qtandroidextras"] path = qtandroidextras url = ../qtandroidextras.git +[submodule "qtenginio"] + path = qtenginio + url = ../qtenginio.git diff --git a/init-repository b/init-repository index 819e98f1..272193d8 100755 --- a/init-repository +++ b/init-repository @@ -208,6 +208,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtdeclarative qtdoc qtdocgallery + qtenginio qtfeedback qtgraphicaleffects qtimageformats diff --git a/qt.pro b/qt.pro index d374afc6..48b29185 100644 --- a/qt.pro +++ b/qt.pro @@ -83,6 +83,7 @@ addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit) addModule(qtdocgallery, qtdeclarative, qtjsondb) !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialport, qtbase) +addModule(qtenginio, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qtenginio b/qtenginio new file mode 160000 index 00000000..136ee0aa --- /dev/null +++ b/qtenginio @@ -0,0 +1 @@ +Subproject commit 136ee0aa5dc2276699018bc743e758ea9ffda12a -- cgit v1.2.3 From babbfd7ae348a5b96999eb09820c1abe7094bcf6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Nov 2013 08:07:31 +0200 Subject: Updated submodules. Change-Id: I5987a236d059243d05d411cdc9f0193448a006ab Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick1 | 2 +- qtscript | 2 +- qtserialport | 2 +- qttools | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index cfa85c76..3b48a65e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cfa85c76c7c7e1622cb02edcbbc3d948edca1e7f +Subproject commit 3b48a65e99839c9427923c03b4e2a87a8465d165 diff --git a/qtconnectivity b/qtconnectivity index 7c050660..3ca1d727 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7c050660daf2460465ccd27e27cc31bebd71a83c +Subproject commit 3ca1d7274328642cd69b0da6891be14880e2f542 diff --git a/qtdeclarative b/qtdeclarative index bbc36ebb..a79e4001 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bbc36ebbc38de276b85947b65d89897bf430add5 +Subproject commit a79e400150e9d550cc4ddc0c0497778d8b78fe5d diff --git a/qtdoc b/qtdoc index 9735e175..7919a2e2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9735e1750f94b3229933fb1118b3ebdc876ede14 +Subproject commit 7919a2e29fa0e48b3426a87f234967aad3296262 diff --git a/qtquick1 b/qtquick1 index c282e56d..960afee2 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit c282e56d3250a32b4458c892f0dbb3159f079028 +Subproject commit 960afee2cf5041d873f596e91eeafb42d3144e98 diff --git a/qtscript b/qtscript index 24d678ce..a2193d3a 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 24d678ce9c3996f46d1069c2b1193e7ec1083fc8 +Subproject commit a2193d3adb703cc14efc21963f0fb0dc4c964e9f diff --git a/qtserialport b/qtserialport index 9181a898..ca636536 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9181a898650158cd73f14edf105ee6d5b12eb7f7 +Subproject commit ca6365369d6676053878d7501f8236582eed94b7 diff --git a/qttools b/qttools index 6c324f9f..f8ba288c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6c324f9f6c8a6bf66b994e1c3730ee7f6a494643 +Subproject commit f8ba288cfaa6db75002572b1b652b7fdd3c0c21f -- cgit v1.2.3 From b742f171c913b182d699270890599e3628d5df10 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Nov 2013 19:33:49 +0200 Subject: Updated submodules. Change-Id: Ibabbfd7ae348a5b96999eb09820c1abe7094bcf6 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtsensors | 2 +- qttools | 2 +- qttranslations | 2 +- qtwinextras | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 3b48a65e..d35c8fe5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3b48a65e99839c9427923c03b4e2a87a8465d165 +Subproject commit d35c8fe52149f0adb7c81da804a5b98cc54a0abe diff --git a/qtdeclarative b/qtdeclarative index a79e4001..d87c1471 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a79e400150e9d550cc4ddc0c0497778d8b78fe5d +Subproject commit d87c1471f1f61133edad313d5159f9fee9e938c5 diff --git a/qtlocation b/qtlocation index 725beb50..06860b6e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 725beb507ac41b05f306a058c5e9a764b647688c +Subproject commit 06860b6ed9c2dc7d00ef5d5afe913aea2bdf0be1 diff --git a/qtmacextras b/qtmacextras index fe4f9e5a..189c2333 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit fe4f9e5a04188eb30950053c7df0f63dfeb52b0e +Subproject commit 189c2333cb8e9f88cd08e83134b25b35c3f6407a diff --git a/qtmultimedia b/qtmultimedia index ac01ab65..4bbdf539 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ac01ab654356435b6db1c8adbf087b4aed3ffc0a +Subproject commit 4bbdf539c0f78f0da05d98025b512b9551a519d9 diff --git a/qtsensors b/qtsensors index 243064b1..303fc6d4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 243064b1226e08943b1bf4103f555202c2cfe3bf +Subproject commit 303fc6d4c3a7e4a15fa9e92dc5448bb8f7982509 diff --git a/qttools b/qttools index f8ba288c..4be30140 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f8ba288cfaa6db75002572b1b652b7fdd3c0c21f +Subproject commit 4be30140ffb095a77a4a83c863c385c4dbc08014 diff --git a/qttranslations b/qttranslations index 8e663f0d..88e03d26 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8e663f0d05ffde8030873496512b851bbbab80b6 +Subproject commit 88e03d26ffa2f2ba0bab3e2e76cc8dc573801b41 diff --git a/qtwinextras b/qtwinextras index 516e6f09..b600d6bc 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 516e6f09375d72088147724fad2acbd762805469 +Subproject commit b600d6bca2ba196969de86fafedb42ad57969164 -- cgit v1.2.3 From 234dcbfcba1e934b05ed0da921f69700ca480ddf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 Nov 2013 13:53:42 +0200 Subject: Updated submodules. Change-Id: Ib742f171c913b182d699270890599e3628d5df10 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtserialport | 2 +- qtwebkit | 2 +- qtxmlpatterns | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index d35c8fe5..161e8653 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d35c8fe52149f0adb7c81da804a5b98cc54a0abe +Subproject commit 161e8653c342278a4881da952ea723b107df93c0 diff --git a/qtdeclarative b/qtdeclarative index d87c1471..2a1fc76f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d87c1471f1f61133edad313d5159f9fee9e938c5 +Subproject commit 2a1fc76f4ed1680e78b740c47fa736768aed82e9 diff --git a/qtserialport b/qtserialport index ca636536..26458aef 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ca6365369d6676053878d7501f8236582eed94b7 +Subproject commit 26458aef426cde967433035d2af0ab244db3aec0 diff --git a/qtwebkit b/qtwebkit index 1511044e..dddffcaa 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 1511044e718c7f2cefcae08fe0d8748afd763ca8 +Subproject commit dddffcaa55bd617159b77e48031e81ef464b358b diff --git a/qtxmlpatterns b/qtxmlpatterns index 5f2a2e71..c5704288 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5f2a2e71eea5daa9ec67db1ca6904762f8bf2b49 +Subproject commit c570428816e3719ba2f5efa5d2c8c88170a085b3 -- cgit v1.2.3 From 749bc264b23ead54af325301479320766afce090 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 6 Nov 2013 03:33:44 +0200 Subject: Updated submodules. Change-Id: I234dcbfcba1e934b05ed0da921f69700ca480ddf Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmacextras | 2 +- qttools | 2 +- qtxmlpatterns | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 161e8653..569dec8e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 161e8653c342278a4881da952ea723b107df93c0 +Subproject commit 569dec8e78030689740b2ff99c071862aa9abaaa diff --git a/qtdeclarative b/qtdeclarative index 2a1fc76f..3a61da32 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2a1fc76f4ed1680e78b740c47fa736768aed82e9 +Subproject commit 3a61da32e485621c9afbd453d22cbe1f6c25479e diff --git a/qtdoc b/qtdoc index 7919a2e2..0937e458 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7919a2e29fa0e48b3426a87f234967aad3296262 +Subproject commit 0937e4582ef4db797b94647cd43c67a8915c538b diff --git a/qtmacextras b/qtmacextras index 189c2333..60b944b7 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 189c2333cb8e9f88cd08e83134b25b35c3f6407a +Subproject commit 60b944b773485646d3994377be74d7ae7d9669e2 diff --git a/qttools b/qttools index 4be30140..f422af85 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4be30140ffb095a77a4a83c863c385c4dbc08014 +Subproject commit f422af85ef01c73b0ea08026448adf99171809d2 diff --git a/qtxmlpatterns b/qtxmlpatterns index c5704288..9dfc499e 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit c570428816e3719ba2f5efa5d2c8c88170a085b3 +Subproject commit 9dfc499e6cde23d5fdcd993c435eb601fc5de1fb -- cgit v1.2.3 From 7c73e564bd61faa38fdd51947f8d98c03230f104 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Nov 2013 03:33:34 +0200 Subject: Updated submodules. Change-Id: I749bc264b23ead54af325301479320766afce090 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 83ff3215..cd3e1f5d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 83ff3215343b253b9edbf2c523b077ff9d206d5b +Subproject commit cd3e1f5dd257fbe1d1b86d4f72eea01293d31047 diff --git a/qtandroidextras b/qtandroidextras index df30d677..abdb3877 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit df30d6777be1ede1cd1b529341c96ed40aa34b37 +Subproject commit abdb38773693745f5d2f8319b470bfbe0373cc1f diff --git a/qtbase b/qtbase index 569dec8e..c819a892 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 569dec8e78030689740b2ff99c071862aa9abaaa +Subproject commit c819a8926959ecadfe2e588e28918ed6fb90ce5d diff --git a/qtconnectivity b/qtconnectivity index 3ca1d727..0910eb9a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3ca1d7274328642cd69b0da6891be14880e2f542 +Subproject commit 0910eb9a769fbcf437dd86db2385496b498e752f diff --git a/qtdeclarative b/qtdeclarative index 3a61da32..1738e4ee 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3a61da32e485621c9afbd453d22cbe1f6c25479e +Subproject commit 1738e4ee119bbcd20d33353e7018f04d92766639 diff --git a/qtdoc b/qtdoc index 0937e458..b430aa84 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0937e4582ef4db797b94647cd43c67a8915c538b +Subproject commit b430aa843350fe5cad777055708af403d3d1dd74 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 11c2286f..c640a496 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 11c2286fcbcae87b24f9d069703d231d5bf997d0 +Subproject commit c640a496d63036ead177dd006ef56b9b12d962bb diff --git a/qtimageformats b/qtimageformats index 701ba023..d507c358 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 701ba023a2d047ef27befc800c428b1dbcf13cff +Subproject commit d507c358b803cd40ec13ed19e00eced80b732571 diff --git a/qtlocation b/qtlocation index 06860b6e..e3db0e40 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 06860b6ed9c2dc7d00ef5d5afe913aea2bdf0be1 +Subproject commit e3db0e405d771e11fa6b4f98d39e90b32db9d612 diff --git a/qtmacextras b/qtmacextras index 60b944b7..1906da15 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 60b944b773485646d3994377be74d7ae7d9669e2 +Subproject commit 1906da15d32340571a04d3d7e2e190bfee26f213 diff --git a/qtmultimedia b/qtmultimedia index 4bbdf539..99667804 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4bbdf539c0f78f0da05d98025b512b9551a519d9 +Subproject commit 99667804e1c64cace1246d4ce342a218fc1fb1ba diff --git a/qtquickcontrols b/qtquickcontrols index 792bb911..8c2e3601 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 792bb911bb5a2af6f00b3d32c654579a700257c6 +Subproject commit 8c2e3601d70b3bc7f004e15797c9fca61332ea5b diff --git a/qtscript b/qtscript index a2193d3a..78985c5c 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a2193d3adb703cc14efc21963f0fb0dc4c964e9f +Subproject commit 78985c5c2c4ec8c7d06bf0c59c5534f968d62f07 diff --git a/qtsensors b/qtsensors index 303fc6d4..e3af89e2 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 303fc6d4c3a7e4a15fa9e92dc5448bb8f7982509 +Subproject commit e3af89e2630bba68d3f10a33bccdd19bbc46664d diff --git a/qtserialport b/qtserialport index 26458aef..9128eddd 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 26458aef426cde967433035d2af0ab244db3aec0 +Subproject commit 9128eddd57cfa95da490e08c49a7fdcdd77b9ff4 diff --git a/qtsvg b/qtsvg index 2af7e73f..b719b937 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2af7e73f7e0335d28bb3de7c985a7305aba36a5e +Subproject commit b719b93770393bbf20251e1dffc70498061e612c diff --git a/qttools b/qttools index f422af85..f0610b8b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f422af85ef01c73b0ea08026448adf99171809d2 +Subproject commit f0610b8b0811d459bb1a9d6c309c013c7e543f84 diff --git a/qtwebkit b/qtwebkit index dddffcaa..8c7a7606 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit dddffcaa55bd617159b77e48031e81ef464b358b +Subproject commit 8c7a7606acbb2083c8077cce57054f43744cb1c0 diff --git a/qtwinextras b/qtwinextras index b600d6bc..7317f444 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit b600d6bca2ba196969de86fafedb42ad57969164 +Subproject commit 7317f4440a9af01feac7758afff8f98e9150dd62 diff --git a/qtx11extras b/qtx11extras index f0e400e1..120c2267 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit f0e400e1bca13176e56cf7bb323cd0a6393a85ea +Subproject commit 120c2267e1960c03a22531c2d5bfe1d87d401ad9 diff --git a/qtxmlpatterns b/qtxmlpatterns index 9dfc499e..97f266a0 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9dfc499e6cde23d5fdcd993c435eb601fc5de1fb +Subproject commit 97f266a006d82cc8554915cba6bf767b93d71a06 -- cgit v1.2.3 From dbac1e77f79ff99945cea41522f535132cacc692 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 Nov 2013 11:45:03 +0100 Subject: try to make the ChangeLog template more inviting move it even futher up and encourage integrating it into the rest of the commit message. Change-Id: I5aaa417a58d420c3d3a8d5ca80dcd9f265c64829 Reviewed-by: Sergio Ahumada Reviewed-by: Marc Mutz Reviewed-by: Frederik Gladhorn Reviewed-by: Thiago Macieira --- .commit-template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.commit-template b/.commit-template index 0aef528f..813ca689 100644 --- a/.commit-template +++ b/.commit-template @@ -4,10 +4,10 @@ # ==[ Details: Describe what changed and explain why it changed ]======| -# ==[ Footers: Uncomment and edit where applicable ]===================| -# # Change log entry (see below for instructions). #[ChangeLog][][] + +# ==[ Footers: Uncomment and edit where applicable ]===================| # # One task per entry. Remember space after colon. #Task-number: @@ -22,7 +22,8 @@ # Change log entry: If this commit adds a significant feature, fixes an # issue or contains a behavior change that is relevant to others, # add a change log entry. It can be multiple lines long and ends with an -# empty newline. +# empty newline. Try to integrate it into the flow of the commit message +# to avoid redundancy. # Use the module name to indicate the area of the change e.g. [QtCore]. # Optionally specify a class or subtopic [QtNetwork][QSslSocket]. # Other common tags are: [General], [Important Behavior Changes], -- cgit v1.2.3 From ec0c8697aa573d7bdec000ab2e6fb0729c0793bc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 16 Dec 2013 11:33:41 +0200 Subject: Updated submodules. Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index cd3e1f5d..0d29579b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cd3e1f5dd257fbe1d1b86d4f72eea01293d31047 +Subproject commit 0d29579baffd4f31a3ec39590117f4fee821694d diff --git a/qtandroidextras b/qtandroidextras index abdb3877..f4e81f8c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit abdb38773693745f5d2f8319b470bfbe0373cc1f +Subproject commit f4e81f8ca53eae6186dc85b2ac46e45d0c2b2b7e diff --git a/qtbase b/qtbase index c819a892..a935b3fb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c819a8926959ecadfe2e588e28918ed6fb90ce5d +Subproject commit a935b3fbd8297e6e2ae6ffdf8ed2790fdf0d46f1 diff --git a/qtconnectivity b/qtconnectivity index 0910eb9a..f8ff297e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0910eb9a769fbcf437dd86db2385496b498e752f +Subproject commit f8ff297e7983d2ec15a85ffd4a815b0500ebadb9 diff --git a/qtdeclarative b/qtdeclarative index 1738e4ee..470ba767 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1738e4ee119bbcd20d33353e7018f04d92766639 +Subproject commit 470ba767663e4ad9d3183fb56ee89361354dfefb diff --git a/qtdoc b/qtdoc index b430aa84..12841ac7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b430aa843350fe5cad777055708af403d3d1dd74 +Subproject commit 12841ac7ee6d418b1abcd54a7fd8a65619cef335 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index c640a496..e8c1b842 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit c640a496d63036ead177dd006ef56b9b12d962bb +Subproject commit e8c1b8423a0e2b36adcf4e238a2bbcb90c731d30 diff --git a/qtimageformats b/qtimageformats index d507c358..b742f21e 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d507c358b803cd40ec13ed19e00eced80b732571 +Subproject commit b742f21e41ee60a4fbb2d0efeed4d518f72590c7 diff --git a/qtlocation b/qtlocation index e3db0e40..f9f88b44 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e3db0e405d771e11fa6b4f98d39e90b32db9d612 +Subproject commit f9f88b44e747db8ad218879fec4dbb1627996aef diff --git a/qtmacextras b/qtmacextras index 1906da15..df23cbf3 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 1906da15d32340571a04d3d7e2e190bfee26f213 +Subproject commit df23cbf333978facc53185bbdf58219c74baf394 diff --git a/qtmultimedia b/qtmultimedia index 99667804..ecce937a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 99667804e1c64cace1246d4ce342a218fc1fb1ba +Subproject commit ecce937a054e4a96597cb13c40d216bddbd45891 diff --git a/qtqa b/qtqa index 50d9961b..aa708804 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 50d9961bc34bcf6a95e14db7d8e1f2fa77098225 +Subproject commit aa708804fe3f61c3fbb87dc78a4d03e659fc3aee diff --git a/qtquick1 b/qtquick1 index 960afee2..a4476cc1 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 960afee2cf5041d873f596e91eeafb42d3144e98 +Subproject commit a4476cc12ee46be6cbb417bda7cf86743aca3064 diff --git a/qtquickcontrols b/qtquickcontrols index 8c2e3601..67b52366 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8c2e3601d70b3bc7f004e15797c9fca61332ea5b +Subproject commit 67b523661037cf807974f256f1146d441d8e7d40 diff --git a/qtrepotools b/qtrepotools index f4a89118..580c2c71 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f4a8911813ab5649ee26d6502587cbf279f32a1c +Subproject commit 580c2c715ce0fe9360cfa3a543b0f9eebcd8a767 diff --git a/qtscript b/qtscript index 78985c5c..a2da34be 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 78985c5c2c4ec8c7d06bf0c59c5534f968d62f07 +Subproject commit a2da34be8426b41047f895a3e8463d58baf3b576 diff --git a/qtsensors b/qtsensors index e3af89e2..07d0e9d5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e3af89e2630bba68d3f10a33bccdd19bbc46664d +Subproject commit 07d0e9d579842436b38d7684df3d3bcac179d6fc diff --git a/qtserialport b/qtserialport index 9128eddd..dda7449d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9128eddd57cfa95da490e08c49a7fdcdd77b9ff4 +Subproject commit dda7449d18cf8aaa542f869dcaea28634d21ecb0 diff --git a/qtsvg b/qtsvg index b719b937..85fd99e8 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b719b93770393bbf20251e1dffc70498061e612c +Subproject commit 85fd99e853d664c74876486f95669bd4cd9f2ab2 diff --git a/qttools b/qttools index f0610b8b..5f7f4a58 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f0610b8b0811d459bb1a9d6c309c013c7e543f84 +Subproject commit 5f7f4a583fdaf7b2ae1a71d8bdd1a0beb290f1c3 diff --git a/qttranslations b/qttranslations index 88e03d26..7e890df6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 88e03d26ffa2f2ba0bab3e2e76cc8dc573801b41 +Subproject commit 7e890df62e1f153323a2d0ea9409b4371784e753 diff --git a/qtwebkit b/qtwebkit index 8c7a7606..40c371c0 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 8c7a7606acbb2083c8077cce57054f43744cb1c0 +Subproject commit 40c371c0deac92e46cdc3302d00ab304bcbca505 diff --git a/qtwebkit-examples b/qtwebkit-examples index 89a33307..5c814406 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 89a3330783ba1b16fca2a27a99e090a458fbd0a9 +Subproject commit 5c814406c67910158bbf725d9a7fcb10fe9f96ee diff --git a/qtwinextras b/qtwinextras index 7317f444..8ddbbfd4 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 7317f4440a9af01feac7758afff8f98e9150dd62 +Subproject commit 8ddbbfd4c8c5c4bc397a001a713c72d070841a6d diff --git a/qtx11extras b/qtx11extras index 120c2267..9131e081 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 120c2267e1960c03a22531c2d5bfe1d87d401ad9 +Subproject commit 9131e081b91b5bbce791d3e328ae46fdb35c565d diff --git a/qtxmlpatterns b/qtxmlpatterns index 97f266a0..1cad275b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 97f266a006d82cc8554915cba6bf767b93d71a06 +Subproject commit 1cad275b6103ce834c9e1ec5d187e7e97e80a119 -- cgit v1.2.3 From a250914fecb288f82db6a7b53e70d433898eb2f4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 20 Dec 2013 03:33:43 +0200 Subject: Updated submodules. Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebkit | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index a935b3fb..260fe985 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a935b3fbd8297e6e2ae6ffdf8ed2790fdf0d46f1 +Subproject commit 260fe985255c46fd2eb0aff378da8dccb5f2703f diff --git a/qtdeclarative b/qtdeclarative index 470ba767..dabe6288 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 470ba767663e4ad9d3183fb56ee89361354dfefb +Subproject commit dabe6288f090072d4d50f894a5f850f6fb8051c1 diff --git a/qtdoc b/qtdoc index 12841ac7..0f590143 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 12841ac7ee6d418b1abcd54a7fd8a65619cef335 +Subproject commit 0f5901432c9b53971df56a1d0e9fc9d7d8336374 diff --git a/qtqa b/qtqa index aa708804..38a26e66 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit aa708804fe3f61c3fbb87dc78a4d03e659fc3aee +Subproject commit 38a26e6605270e801c2ede6e026f7591cdc3200d diff --git a/qtquickcontrols b/qtquickcontrols index 67b52366..ae380584 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 67b523661037cf807974f256f1146d441d8e7d40 +Subproject commit ae380584de53cf927fe4a7bd62ffb41f73b1faa1 diff --git a/qtserialport b/qtserialport index dda7449d..4e15aa6d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit dda7449d18cf8aaa542f869dcaea28634d21ecb0 +Subproject commit 4e15aa6d7c4f9a03f4ae57b3ba04ade3400cccf1 diff --git a/qttools b/qttools index 5f7f4a58..4799a620 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5f7f4a583fdaf7b2ae1a71d8bdd1a0beb290f1c3 +Subproject commit 4799a620e646a82d3759544a3d54e56d2183c0fc diff --git a/qtwebkit b/qtwebkit index 40c371c0..3bb9504f 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 40c371c0deac92e46cdc3302d00ab304bcbca505 +Subproject commit 3bb9504f1ba458fac713200cb4dfcb2592c8f0ea -- cgit v1.2.3 From 06d0fa240f6a0f99770e51969543608dbaf5f7e0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 1 Jan 2014 03:33:43 +0200 Subject: Updated submodules. Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtxmlpatterns | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index 260fe985..631c3dbc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 260fe985255c46fd2eb0aff378da8dccb5f2703f +Subproject commit 631c3dbc800bb9b2e3b227c0a09523f0f7eef0b7 diff --git a/qtconnectivity b/qtconnectivity index f8ff297e..9f547761 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f8ff297e7983d2ec15a85ffd4a815b0500ebadb9 +Subproject commit 9f547761f35fff54994f805735d5ac2e538e53dc diff --git a/qtdeclarative b/qtdeclarative index dabe6288..ef9f85ad 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dabe6288f090072d4d50f894a5f850f6fb8051c1 +Subproject commit ef9f85ad8d2774cb11cbd8cfc5943af2dcf72339 diff --git a/qtmultimedia b/qtmultimedia index ecce937a..a0df6c38 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ecce937a054e4a96597cb13c40d216bddbd45891 +Subproject commit a0df6c38364c87001258fe9f2375a2bd34ce4cfc diff --git a/qtquickcontrols b/qtquickcontrols index ae380584..cd8eb15f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ae380584de53cf927fe4a7bd62ffb41f73b1faa1 +Subproject commit cd8eb15f5e37c843ed8b53f071b8ff11eba6986c diff --git a/qtserialport b/qtserialport index 4e15aa6d..cb2dd80a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 4e15aa6d7c4f9a03f4ae57b3ba04ade3400cccf1 +Subproject commit cb2dd80a4fce3a190be121c80486c6ba407f5fbf diff --git a/qtsvg b/qtsvg index 85fd99e8..0151f7f2 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 85fd99e853d664c74876486f95669bd4cd9f2ab2 +Subproject commit 0151f7f2901b281e358a5ece436e2464b4b8d79c diff --git a/qttools b/qttools index 4799a620..856ba53f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4799a620e646a82d3759544a3d54e56d2183c0fc +Subproject commit 856ba53f77bc3d7b39c5e35d0249ead595dc0439 diff --git a/qtwebkit b/qtwebkit index 3bb9504f..9ecc1d5a 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 3bb9504f1ba458fac713200cb4dfcb2592c8f0ea +Subproject commit 9ecc1d5ad7440c03f26ad557e45c0a92016d9367 diff --git a/qtxmlpatterns b/qtxmlpatterns index 1cad275b..afb65f63 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1cad275b6103ce834c9e1ec5d187e7e97e80a119 +Subproject commit afb65f63a131c4038b0984c1d51b8ffdb4aab129 -- cgit v1.2.3 From 402457bcfbad53c6dd2214290c668ece693bbdcd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 9 Jan 2014 03:33:40 +0200 Subject: Updated submodules. Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 631c3dbc..f0f6c1d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 631c3dbc800bb9b2e3b227c0a09523f0f7eef0b7 +Subproject commit f0f6c1d0edd8c71530b8e47b61d70aa55a0c6a0c diff --git a/qtconnectivity b/qtconnectivity index 9f547761..02a74dce 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9f547761f35fff54994f805735d5ac2e538e53dc +Subproject commit 02a74dcea028f42d481774134a8b5915212e4c17 diff --git a/qtdeclarative b/qtdeclarative index ef9f85ad..8673ae8b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ef9f85ad8d2774cb11cbd8cfc5943af2dcf72339 +Subproject commit 8673ae8bb6d4bac01cc54638a7d617072299a808 diff --git a/qtdoc b/qtdoc index 0f590143..d68798ea 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0f5901432c9b53971df56a1d0e9fc9d7d8336374 +Subproject commit d68798ea7a94eec17b91e064e36e1d24b16765be diff --git a/qtmultimedia b/qtmultimedia index a0df6c38..f74d7393 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a0df6c38364c87001258fe9f2375a2bd34ce4cfc +Subproject commit f74d7393b88b89933b286b61e4e67ef46809448b diff --git a/qtquickcontrols b/qtquickcontrols index cd8eb15f..08a32dff 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit cd8eb15f5e37c843ed8b53f071b8ff11eba6986c +Subproject commit 08a32dff66a89fb517e86d3a2232407bd37fb715 diff --git a/qtrepotools b/qtrepotools index 580c2c71..d8858f66 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 580c2c715ce0fe9360cfa3a543b0f9eebcd8a767 +Subproject commit d8858f6602714824f8e2c2f665ff8c77d2909521 diff --git a/qtserialport b/qtserialport index cb2dd80a..d5658bd0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit cb2dd80a4fce3a190be121c80486c6ba407f5fbf +Subproject commit d5658bd0ced4a1eb0703d3cb1b566025d610fbdd diff --git a/qttools b/qttools index 856ba53f..f22850f4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 856ba53f77bc3d7b39c5e35d0249ead595dc0439 +Subproject commit f22850f46b5fdfbe58681e92750addb8d4c3df3f diff --git a/qttranslations b/qttranslations index 7e890df6..f0283f70 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 7e890df62e1f153323a2d0ea9409b4371784e753 +Subproject commit f0283f70a343a8d1013fc60902ce1292a4c9c770 diff --git a/qtwebkit b/qtwebkit index 9ecc1d5a..9b0de4a4 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 9ecc1d5ad7440c03f26ad557e45c0a92016d9367 +Subproject commit 9b0de4a45f7172710d5722ff302d43efde2c5365 -- cgit v1.2.3 From c8d3a71d7cf7e92224064aa989a9551ee52c9d57 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Jan 2014 03:34:23 +0200 Subject: Updated submodules. Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd Reviewed-by: Matti Paaso --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtsvg | 2 +- qttools | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 0d29579b..279fc6ce 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0d29579baffd4f31a3ec39590117f4fee821694d +Subproject commit 279fc6ce0d6b56a9336240a549118220c9c9388d diff --git a/qtbase b/qtbase index f0f6c1d0..eaedc04d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f0f6c1d0edd8c71530b8e47b61d70aa55a0c6a0c +Subproject commit eaedc04d90fdfc28cc9de96a32635bf327769086 diff --git a/qtdeclarative b/qtdeclarative index 8673ae8b..d580411c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8673ae8bb6d4bac01cc54638a7d617072299a808 +Subproject commit d580411cab0d0a91c73e111ac2c0c6c8f77118fa diff --git a/qtdoc b/qtdoc index d68798ea..960f92f8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d68798ea7a94eec17b91e064e36e1d24b16765be +Subproject commit 960f92f8b6e4ee1f5993ebf642d3490aa0a30477 diff --git a/qtsvg b/qtsvg index 0151f7f2..62c81447 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0151f7f2901b281e358a5ece436e2464b4b8d79c +Subproject commit 62c8144782b380407c87d0f75a0f7f7df3847035 diff --git a/qttools b/qttools index f22850f4..2aba84b7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f22850f46b5fdfbe58681e92750addb8d4c3df3f +Subproject commit 2aba84b72e3ff110209da3ba1bdca07d3d21522c diff --git a/qtxmlpatterns b/qtxmlpatterns index afb65f63..57350510 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit afb65f63a131c4038b0984c1d51b8ffdb4aab129 +Subproject commit 57350510bec47a94e6d9d95af9a792f0a815b834 -- cgit v1.2.3 From 5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 17 Jan 2014 03:34:49 +0200 Subject: Updated submodules. Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 279fc6ce..4c9ff9ae 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 279fc6ce0d6b56a9336240a549118220c9c9388d +Subproject commit 4c9ff9aee8d235f7bf2a7c996682ead00434034d diff --git a/qtandroidextras b/qtandroidextras index f4e81f8c..39f11255 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit f4e81f8ca53eae6186dc85b2ac46e45d0c2b2b7e +Subproject commit 39f11255247335531430ca129123f651e60ccd74 diff --git a/qtbase b/qtbase index eaedc04d..7c813176 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit eaedc04d90fdfc28cc9de96a32635bf327769086 +Subproject commit 7c8131763de9e70ca56f16635716e7e00559b5d1 diff --git a/qtconnectivity b/qtconnectivity index 02a74dce..cb1ebc68 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 02a74dcea028f42d481774134a8b5915212e4c17 +Subproject commit cb1ebc687df22fa80c5b4e6f78af730b1a581ac8 diff --git a/qtdeclarative b/qtdeclarative index d580411c..7030adff 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d580411cab0d0a91c73e111ac2c0c6c8f77118fa +Subproject commit 7030adff1869e850a7b983e88d7a773d5d594886 diff --git a/qtdoc b/qtdoc index 960f92f8..34220f07 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 960f92f8b6e4ee1f5993ebf642d3490aa0a30477 +Subproject commit 34220f073f3df08769a2874cd6f86562ceb1816b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index e8c1b842..a65e88aa 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit e8c1b8423a0e2b36adcf4e238a2bbcb90c731d30 +Subproject commit a65e88aa4eeccb3e6e3d1888d5e2e866487c851f diff --git a/qtimageformats b/qtimageformats index b742f21e..dde6daec 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b742f21e41ee60a4fbb2d0efeed4d518f72590c7 +Subproject commit dde6daeccdf0a3f8d49fe1777b49046576b12218 diff --git a/qtlocation b/qtlocation index f9f88b44..70cda18f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f9f88b44e747db8ad218879fec4dbb1627996aef +Subproject commit 70cda18f23e9724dd97faabc0405b1377628f8ac diff --git a/qtmacextras b/qtmacextras index df23cbf3..39ccd598 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit df23cbf333978facc53185bbdf58219c74baf394 +Subproject commit 39ccd598cd36b01e3b876f55030c639a9bc39687 diff --git a/qtmultimedia b/qtmultimedia index f74d7393..88ef2bf8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f74d7393b88b89933b286b61e4e67ef46809448b +Subproject commit 88ef2bf83de18542428151553cbfa87de2469c90 diff --git a/qtqa b/qtqa index 38a26e66..1de258a2 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 38a26e6605270e801c2ede6e026f7591cdc3200d +Subproject commit 1de258a2adc3421159075d38da4efb3b3df02f94 diff --git a/qtquick1 b/qtquick1 index a4476cc1..281d5450 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit a4476cc12ee46be6cbb417bda7cf86743aca3064 +Subproject commit 281d54501ebf7088459354037b02746a7c77f3b6 diff --git a/qtquickcontrols b/qtquickcontrols index 08a32dff..66e1e0fe 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 08a32dff66a89fb517e86d3a2232407bd37fb715 +Subproject commit 66e1e0fee78f2b0a4412927ad39df4be564d15d1 diff --git a/qtrepotools b/qtrepotools index d8858f66..0f80e8a8 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d8858f6602714824f8e2c2f665ff8c77d2909521 +Subproject commit 0f80e8a8fa001d0e36b313ae4b8696eadd594a52 diff --git a/qtscript b/qtscript index a2da34be..f89d64ca 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a2da34be8426b41047f895a3e8463d58baf3b576 +Subproject commit f89d64ca722acf4a1a38c5e136bb01eff2525978 diff --git a/qtsensors b/qtsensors index 07d0e9d5..9a8319a3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 07d0e9d579842436b38d7684df3d3bcac179d6fc +Subproject commit 9a8319a39a06d6cf3163978301d650b8f3558c62 diff --git a/qtserialport b/qtserialport index d5658bd0..2a83fbd6 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit d5658bd0ced4a1eb0703d3cb1b566025d610fbdd +Subproject commit 2a83fbd6c70032d236bbdf0d87aaf51908cd5afd diff --git a/qtsvg b/qtsvg index 62c81447..ae68091e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 62c8144782b380407c87d0f75a0f7f7df3847035 +Subproject commit ae68091e0d6023410bc657cf54e7fa9b6c8bbcc2 diff --git a/qttools b/qttools index 2aba84b7..2c5999a3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2aba84b72e3ff110209da3ba1bdca07d3d21522c +Subproject commit 2c5999a3e3d3d612863eb3f99702634a5cc83ffd diff --git a/qtwebkit b/qtwebkit index 9b0de4a4..231d3a18 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 9b0de4a45f7172710d5722ff302d43efde2c5365 +Subproject commit 231d3a189afaa061dae71c8e939e59c0e120db4d diff --git a/qtwebkit-examples b/qtwebkit-examples index 5c814406..cb8ed969 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 5c814406c67910158bbf725d9a7fcb10fe9f96ee +Subproject commit cb8ed9694b850a429a93490beaa6462d9f3b8ea6 diff --git a/qtwinextras b/qtwinextras index 8ddbbfd4..8bbc4f8b 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 8ddbbfd4c8c5c4bc397a001a713c72d070841a6d +Subproject commit 8bbc4f8bc92808cea219698d61a669ce20bdf6ea diff --git a/qtx11extras b/qtx11extras index 9131e081..dd7eec92 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 9131e081b91b5bbce791d3e328ae46fdb35c565d +Subproject commit dd7eec92e7a5f4383783cc161f638867572dc208 diff --git a/qtxmlpatterns b/qtxmlpatterns index 57350510..ecf06489 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 57350510bec47a94e6d9d95af9a792f0a815b834 +Subproject commit ecf06489d90385cf2ca67dc5f70529f76421beae -- cgit v1.2.3 From a968d5d5314ac04835e90be462b1a71f8ab293e9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Jan 2014 11:34:08 +0200 Subject: Updated submodules. Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qttranslations | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 7c813176..446f9f28 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7c8131763de9e70ca56f16635716e7e00559b5d1 +Subproject commit 446f9f2812e9f351caca11750792dadbd4e53662 diff --git a/qtconnectivity b/qtconnectivity index cb1ebc68..92609ca2 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cb1ebc687df22fa80c5b4e6f78af730b1a581ac8 +Subproject commit 92609ca2efc33a091ede3e16a5f077fa227c3f1f diff --git a/qtdeclarative b/qtdeclarative index 7030adff..46ffd0e4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7030adff1869e850a7b983e88d7a773d5d594886 +Subproject commit 46ffd0e470b66e8cc501d5caf4ba92022d1ee474 diff --git a/qtlocation b/qtlocation index 70cda18f..ca0ff221 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 70cda18f23e9724dd97faabc0405b1377628f8ac +Subproject commit ca0ff22144a54215bc25dfe6f4d3a7fa18c6e928 diff --git a/qtmultimedia b/qtmultimedia index 88ef2bf8..a52f552d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 88ef2bf83de18542428151553cbfa87de2469c90 +Subproject commit a52f552d4274eeaeb3a7362c509e77df501b1349 diff --git a/qttranslations b/qttranslations index f0283f70..0f83fe6f 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f0283f70a343a8d1013fc60902ce1292a4c9c770 +Subproject commit 0f83fe6f0f802fe799f178c5c61e141b39f78a4d -- cgit v1.2.3 From b25883ebaafe1b86077d77d5598355d1f9320a5a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Jan 2014 19:34:32 +0200 Subject: Updated submodules. Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 446f9f28..e4b94dd1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 446f9f2812e9f351caca11750792dadbd4e53662 +Subproject commit e4b94dd19cccd769f8326df20556a8900e7cfb3f diff --git a/qtconnectivity b/qtconnectivity index 92609ca2..1f33f347 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 92609ca2efc33a091ede3e16a5f077fa227c3f1f +Subproject commit 1f33f347fad40f71fa89110c084880a81db1d15a diff --git a/qtdeclarative b/qtdeclarative index 46ffd0e4..4c5cd2f0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 46ffd0e470b66e8cc501d5caf4ba92022d1ee474 +Subproject commit 4c5cd2f04fdaf946cc67896db7c190a318811d86 diff --git a/qtmultimedia b/qtmultimedia index a52f552d..60fb11d9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a52f552d4274eeaeb3a7362c509e77df501b1349 +Subproject commit 60fb11d9a2f5ff659a6ccffe01b4de16c1fb5929 -- cgit v1.2.3 From 604f330cd22bcb044f43bcd7ce6f4fe0ed2fe057 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 12 Nov 2013 16:35:05 +0100 Subject: don't unnecessarily confuse qt creator our CONFIG+=build_pass hack has the side effect that qmake does not emit the calling command line to the makefile, which makes creator unable to detect the build. so revert the hack as soon as it did its deed. Task-number: QTBUG-34788 Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e Reviewed-by: Joerg Bornemann --- qt.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/qt.pro b/qt.pro index 48b29185..f9344690 100644 --- a/qt.pro +++ b/qt.pro @@ -3,6 +3,7 @@ cache(, super) CONFIG += build_pass # hack to disable the .qmake.super auto-add load(qt_build_config) +CONFIG -= build_pass # unhack, as it confuses Qt Creator TEMPLATE = subdirs -- cgit v1.2.3