diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 12:11:11 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 12:11:11 +1000 |
commit | 3ab36e99cf79d9c889e7bf6fab0e8487c505d5b0 (patch) | |
tree | 1dbd9d59d5cda3940f3e8fc9a80c626fbfc21803 | |
parent | 0d7c262847bbe793bd5c876fef93c865a3c9b7f1 (diff) | |
parent | e9fae0f07f3d84f925e98d954bc81ce0463c1b5d (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
Update to latest qtbase master.
Remove platform-specific logic for qtactiveqt module.
Updated to latest version of qtrepotools.
update to the master branch in each submodules
m--------- | qlalr | 0 | ||||
-rw-r--r-- | qt.pro | 2 | ||||
m--------- | qtactiveqt | 0 | ||||
m--------- | qtbase | 0 | ||||
m--------- | qtdeclarative | 0 | ||||
m--------- | qtdoc | 0 | ||||
m--------- | qtlocation | 0 | ||||
m--------- | qtmultimedia | 0 | ||||
m--------- | qtphonon | 0 | ||||
m--------- | qtqa | 0 | ||||
m--------- | qtrepotools | 0 | ||||
m--------- | qtscript | 0 | ||||
m--------- | qtsvg | 0 | ||||
m--------- | qttools | 0 | ||||
m--------- | qttranslations | 0 | ||||
m--------- | qtxmlpatterns | 0 |
16 files changed, 1 insertions, 1 deletions
diff --git a/qlalr b/qlalr -Subproject 5b417d37c9584c0219d05e859d53d17d6e3a4fb +Subproject dcdd262b031e29fe8f01ff048ce86b9e791fc99 @@ -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 -Subproject e2deded490725473f1bb0b042e5022fffe534f2 +Subproject 6729e60cfac84e8f6eb28cf473ce0c75f88d35c diff --git a/qtbase b/qtbase -Subproject 0c637cb07ba3c9b353e7e483a209537485cc4e2 +Subproject 0add5fe930e275924813376bb06cbfc0f5f779d diff --git a/qtdeclarative b/qtdeclarative -Subproject 90ff2cdea3126bdff2746ecf868004711ea628b +Subproject 6c6cf86e7d65f8f5154d62ad0ed67d522126933 diff --git a/qtdoc b/qtdoc -Subproject 624a67422c69e2280d4ce90c87992f383688d89 +Subproject aa35a518920a46757caff8604a1bf0a7459d489 diff --git a/qtlocation b/qtlocation -Subproject 5cd7fecf53ee6f4381417db3dd199fd3355685d +Subproject 9b0d684b569e32dc9b8e13ebeeb3544d86871ff diff --git a/qtmultimedia b/qtmultimedia -Subproject 89d67a2b8060a813c7796861c404de897c3a44e +Subproject 306424c55f9df61b686754591006b9e7e54a13d diff --git a/qtphonon b/qtphonon -Subproject 3c8a216b855d158c48c27e06294226aab611426 +Subproject 958a8233fdcb5a541692f8750d451bce54e2090 diff --git a/qtqa b/qtqa -Subproject bf2e1a63ef2c9923baccaca7001382244b1e2f0 +Subproject 4bdb72f4110e4c95c7ac73eaf0828727cd80cf7 diff --git a/qtrepotools b/qtrepotools -Subproject 9cfb67cdb977198a2e67eea42d756dabbcdc385 +Subproject c297e2071c7e2d4ec4c1d2bec2f76a12f45c922 diff --git a/qtscript b/qtscript -Subproject 4d15ca64fc7ca81bdadba9fbeb84d4e98a6c0ed +Subproject 0e575c1a309e8728313355e924de7c21ce3215e diff --git a/qtsvg b/qtsvg -Subproject 1a71611b6ceaf6cdb24ea485a818fc56c956b5f +Subproject 5e23c8dce60032ae7bb148320ed922bc146f960 diff --git a/qttools b/qttools -Subproject 735e2403f1ba0daa3dd407bcfe3c3b2ca2cc211 +Subproject 363d254bd46c0c15a34c4ff533dad7f60642553 diff --git a/qttranslations b/qttranslations -Subproject 1b2ef359deb6f2ef8fc0dca3ed18ed4733b4482 +Subproject dbe2cf64abca0eb6e0846e2e080943a2a3cd471 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 26edd6852a62aeec49712a53dcc8d4093192301 +Subproject 4af695e018452075dc3c8e07bbec8d52c6fae34 |