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
2026-04-12 16:29:28 +08:00 · 2011-05-13 12:11:11 +10:00
parent 0d7c262847 e9fae0f07f
commit 3ab36e99cf
16 changed files with 16 additions and 16 deletions
--- a/2
+++ b/2
--- 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
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2