From 44c2257210ce9b2fc9f6e534f354db741b900b0e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 11 May 2011 15:12:10 +0200 Subject: [PATCH 1/4] update to the master branch in each submodules --- qlalr | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtphonon | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qlalr b/qlalr index 5b417d37..dcdd262b 160000 --- a/qlalr +++ b/qlalr @@ -1 +1 @@ -Subproject commit 5b417d37c9584c0219d05e859d53d17d6e3a4fb2 +Subproject commit dcdd262b031e29fe8f01ff048ce86b9e791fc998 diff --git a/qtbase b/qtbase index 0c637cb0..eb5ad10b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0c637cb07ba3c9b353e7e483a209537485cc4e2a +Subproject commit eb5ad10b2cc954919e224f3c18c05898b52e0403 diff --git a/qtdeclarative b/qtdeclarative index 90ff2cde..6c6cf86e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 90ff2cdea3126bdff2746ecf868004711ea628b1 +Subproject commit 6c6cf86e7d65f8f5154d62ad0ed67d5221269335 diff --git a/qtdoc b/qtdoc index 624a6742..aa35a518 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 624a67422c69e2280d4ce90c87992f383688d892 +Subproject commit aa35a518920a46757caff8604a1bf0a7459d489a diff --git a/qtlocation b/qtlocation index 5cd7fecf..9b0d684b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5cd7fecf53ee6f4381417db3dd199fd3355685d2 +Subproject commit 9b0d684b569e32dc9b8e13ebeeb3544d86871fff diff --git a/qtmultimedia b/qtmultimedia index 89d67a2b..306424c5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 89d67a2b8060a813c7796861c404de897c3a44ec +Subproject commit 306424c55f9df61b686754591006b9e7e54a13d4 diff --git a/qtphonon b/qtphonon index 3c8a216b..958a8233 160000 --- a/qtphonon +++ b/qtphonon @@ -1 +1 @@ -Subproject commit 3c8a216b855d158c48c27e06294226aab611426c +Subproject commit 958a8233fdcb5a541692f8750d451bce54e2090e diff --git a/qtqa b/qtqa index bf2e1a63..4bdb72f4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit bf2e1a63ef2c9923baccaca7001382244b1e2f06 +Subproject commit 4bdb72f4110e4c95c7ac73eaf0828727cd80cf73 diff --git a/qtrepotools b/qtrepotools index 9cfb67cd..6f8010e7 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9cfb67cdb977198a2e67eea42d756dabbcdc3854 +Subproject commit 6f8010e7da22efca2434a8688dc29b562cf67a43 diff --git a/qtscript b/qtscript index 4d15ca64..0e575c1a 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 4d15ca64fc7ca81bdadba9fbeb84d4e98a6c0edc +Subproject commit 0e575c1a309e8728313355e924de7c21ce3215e7 diff --git a/qtsvg b/qtsvg index 1a71611b..5e23c8dc 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1a71611b6ceaf6cdb24ea485a818fc56c956b5f8 +Subproject commit 5e23c8dce60032ae7bb148320ed922bc146f9602 diff --git a/qttools b/qttools index 735e2403..363d254b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 735e2403f1ba0daa3dd407bcfe3c3b2ca2cc211e +Subproject commit 363d254bd46c0c15a34c4ff533dad7f606425537 diff --git a/qttranslations b/qttranslations index 1b2ef359..dbe2cf64 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1b2ef359deb6f2ef8fc0dca3ed18ed4733b44822 +Subproject commit dbe2cf64abca0eb6e0846e2e080943a2a3cd4718 diff --git a/qtxmlpatterns b/qtxmlpatterns index 26edd685..4af695e0 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 26edd6852a62aeec49712a53dcc8d4093192301c +Subproject commit 4af695e018452075dc3c8e07bbec8d52c6fae347 From 3dfd8e78d467239bb230addb7617e7f0949d29b4 Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 12 May 2011 10:46:29 +0200 Subject: [PATCH 2/4] Updated to latest version of qtrepotools. It's necessary to make sure the git-qt-graft script works in a fresh clone. --- qtrepotools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtrepotools b/qtrepotools index 6f8010e7..c297e207 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 6f8010e7da22efca2434a8688dc29b562cf67a43 +Subproject commit c297e2071c7e2d4ec4c1d2bec2f76a12f45c9224 From d4da74a74d248375a08dc5bac2f9b1afe9a452f3 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 13 May 2011 10:13:24 +1000 Subject: [PATCH 3/4] Remove platform-specific logic for qtactiveqt module. For the sake of a uniform test procedure, it is cleaner to have `make module-qtactiveqt' always working, but simply not building anything on platforms where ActiveQt is not supported. Without this, any test procedure for building Qt5 needs to be able to know or determine that ActiveQt should only be built on Windows. Reviewed-by: Jason McDonald Change-Id: I3869bbacdc6598a764561a4b9f6042c49e6ffae8 --- qt.pro | 2 +- qtactiveqt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt.pro b/qt.pro index f174aed1..78cff58c 100644 --- a/qt.pro +++ b/qt.pro @@ -85,10 +85,10 @@ SUBDIRS = \ module_qlalr \ module_qtqa \ module_qtlocation \ + module_qtactiveqt \ exists(qtwebkit/Tools/Scripts/build-webkit) { SUBDIRS += module_qtwebkit \ module_qtwebkit_examples_and_demos module_qttools.depends += module_qtwebkit } -win32:SUBDIRS += module_qtactiveqt diff --git a/qtactiveqt b/qtactiveqt index e2deded4..6729e60c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e2deded490725473f1bb0b042e5022fffe534f2c +Subproject commit 6729e60cfac84e8f6eb28cf473ce0c75f88d35cd From e9fae0f07f3d84f925e98d954bc81ce0463c1b5d Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 13 May 2011 12:04:56 +1000 Subject: [PATCH 4/4] Update to latest qtbase master. --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index eb5ad10b..0add5fe9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit eb5ad10b2cc954919e224f3c18c05898b52e0403 +Subproject commit 0add5fe930e275924813376bb06cbfc0f5f779d3