Merge branch 'stable' into release

Conflicts:
	README
	qtwebkit-examples-and-demos

Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53

.gitmodules

@@ -1,54 +1,96 @@
 [submodule "qtbase"]
 	path = qtbase
-	url = git://gitorious.org/qt/qtbase.git
+	url = ../qtbase.git
 [submodule "qtsvg"]
 	path = qtsvg
-	url = git://gitorious.org/qt/qtsvg.git
+	url = ../qtsvg.git
 [submodule "qtdeclarative"]
 	path = qtdeclarative
-	url = git://gitorious.org/qt/qtdeclarative.git
+	url = ../qtdeclarative.git
 [submodule "qtactiveqt"]
 	path = qtactiveqt
-	url = git://gitorious.org/qt/qtactiveqt.git
+	url = ../qtactiveqt.git
 [submodule "qtscript"]
 	path = qtscript
-	url = git://gitorious.org/qt/qtscript.git
+	url = ../qtscript.git
 [submodule "qtmultimedia"]
 	path = qtmultimedia
-	url = git://gitorious.org/qt/qtmultimedia.git
+	url = ../qtmultimedia.git
 [submodule "qttools"]
 	path = qttools
-	url = git://gitorious.org/qt/qttools.git
+	url = ../qttools.git
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
-	url = git://gitorious.org/qt/qtxmlpatterns.git
+	url = ../qtxmlpatterns.git
 [submodule "qttranslations"]
 	path = qttranslations
-	url = git://gitorious.org/qt/qttranslations.git
+	url = ../qttranslations.git
 [submodule "qtdoc"]
 	path = qtdoc
-	url = git://gitorious.org/qt/qtdoc.git
+	url = ../qtdoc.git
+[submodule "qlalr"]
+	path = qlalr
+	url = ../qlalr.git
 [submodule "qtrepotools"]
 	path = qtrepotools
-	url = git://gitorious.org/qt/qtrepotools.git
+	url = ../qtrepotools.git
 [submodule "qtwebkit"]
 	path = qtwebkit
-	url = git://gitorious.org/qt/qtwebkit.git
-[submodule "qtwebkit-examples-and-demos"]
-	path = qtwebkit-examples-and-demos
-	url = git://gitorious.org/qt/qtwebkit-examples-and-demos.git
+	url = ../qtwebkit.git
+[submodule "qtwebkit-examples"]
+	path = qtwebkit-examples
+	url = ../qtwebkit-examples.git
 [submodule "qtqa"]
 	path = qtqa
-	url = git://gitorious.org/qt/qtqa.git
+	url = ../qtqa.git
+[submodule "qtlocation"]
+	path = qtlocation
+	url = ../qtlocation.git
+[submodule "qtsensors"]
+	path = qtsensors
+	url = ../qtsensors.git
+[submodule "qtsystems"]
+	path = qtsystems
+	url = ../qtsystems.git
+[submodule "qtfeedback"]
+	path = qtfeedback
+	url = ../qtfeedback.git
+[submodule "qtdocgallery"]
+	path = qtdocgallery
+	url = ../qtdocgallery.git
+[submodule "qtpim"]
+	path = qtpim
+	url = ../qtpim.git
+[submodule "qtconnectivity"]
+	path = qtconnectivity
+	url = ../qtconnectivity.git
+[submodule "qtwayland"]
+	path = qtwayland
+	url = ../qtwayland.git
+[submodule "qtjsondb"]
+	path = qtjsondb
+	url = ../qtjsondb.git
+[submodule "qt3d"]
+	path = qt3d
+	url = ../qt3d.git
 [submodule "qtjsbackend"]
 	path = qtjsbackend
-	url = git://gitorious.org/qt/qtjsbackend.git
+	url = ../qtjsbackend.git
 [submodule "qtimageformats"]
 	path = qtimageformats
-	url = git://gitorious.org/qt/qtimageformats.git
+	url = ../qtimageformats.git
 [submodule "qtquick1"]
 	path = qtquick1
-	url = git://gitorious.org/qt/qtquick1.git
+	url = ../qtquick1.git
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
-	url = git://gitorious.org/qt/qtgraphicaleffects.git
+	url = ../qtgraphicaleffects.git
+[submodule "qtquickcontrols"]
+	path = qtquickcontrols
+	url = ../qtquickcontrols.git
+[submodule "qtserialport"]
+	path = qtserialport
+	url = ../qtserialport.git
+[submodule "qtx11extras"]
+	path = qtx11extras
+	url = ../qtx11extras.git

README

@@ -49,17 +49,16 @@ HOW TO BUILD QT5
    Windows:
    --------
 
-     Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that Perl
-     version 5.12 or later and Python version 2.7 or later can be found in the
-     path.
+     Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the
+     following tools can be found in the path:
+     * Perl version 5.12 or later   [http://www.activestate.com/activeperl/]
+     * Python version 2.7 or later  [http://www.activestate.com/activepython/]
+     * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
 
      cd <path>\qt-everywhere-opensource-src-<version>
      configure -prefix %CD%\qtbase -opensource -nomake tests
      nmake // jom // mingw32-make
 
-     For MinGW (gcc version 4.6 or later), ensure that the compiler can
-     be found in the path.
-
      To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
      "-make-tool jom" on the configure command line. If you do not use jom,
      adding "/MP" to the CL environment variable is a good idea.
@@ -122,6 +121,7 @@ HOW TO BUILD QT5
  =====================
  See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git
  for more information.
+ See http://qt-project.org/wiki/Qt-5 for the reference platforms.
 
 
  Documentation

init-repository

@@ -91,6 +91,8 @@ git repository.
 
 Only initialize the specified subset of modules given as the argument. Specified
 modules must already exist in .gitmodules.
+The string "all" results in cloning all known modules. The default is the set of
+maintained modules.
 
 =item --no-update
 
@@ -217,25 +219,55 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtconnectivity
     qtdeclarative
     qtdoc
+    qtdocgallery
     qtfeedback
     qtgraphicaleffects
     qtimageformats
+    qtjsondb
     qtjsbackend
     qtlocation
     qtmultimedia
     qtpim
     qtqa
     qtquick1
+    qtquickcontrols
     qtrepotools
     qtscript
     qtsensors
+    qtserialport
     qtsvg
     qtsystems
     qttools
     qttranslations
     qtwayland
     qtwebkit
-    qtwebkit-examples-and-demos
+    qtwebkit-examples
+    qtx11extras
+    qtxmlpatterns
+);
+
+my @DEFAULT_REPOS = qw(
+    qtactiveqt
+    qtbase
+    qtdeclarative
+    qtdoc
+    qtgraphicaleffects
+    qtimageformats
+    qtjsbackend
+    qtmultimedia
+    qtqa
+    qtquick1
+    qtquickcontrols
+    qtrepotools
+    qtscript
+    qtsensors
+    qtserialport
+    qtsvg
+    qttools
+    qttranslations
+    qtwebkit
+    qtwebkit-examples
+    qtx11extras
     qtxmlpatterns
 );
 
@@ -287,7 +319,7 @@ sub parse_arguments
         'protocol'            => "",
         'update'              => 1 ,
         'webkit'              => 1 ,
-        'module-subset'       => "",
+        'module-subset'       => join(",", @DEFAULT_REPOS),
     );
 
     GetOptionsFromArray(\@args,
@@ -328,7 +360,9 @@ sub parse_arguments
     # Replace any double trailing slashes from end of mirror
     $self->{'mirror-url'} =~ s{//+$}{/};
 
-    if ($self->{'module-subset'}) {
+    if ($self->{'module-subset'} eq "all") {
+        $self->{'module-subset'} = "";
+    } else {
         $self->{'module-subset'} = {
             map { $_ => 1 } split(qr{,}, $self->{'module-subset'})
         };
@@ -385,7 +419,7 @@ sub git_disable_webkit_submodule
     my ($self) = @_;
 
     $self->exe('git', 'config', '--remove', 'submodule.qtwebkit');
-    $self->exe('git', 'config', '--remove', 'submodule.qtwebkit-examples-and-demos');
+    $self->exe('git', 'config', '--remove', 'submodule.qtwebkit-examples');
 
     return;
 }

qt.pro

@@ -1,129 +1,86 @@
 # Create the super cache so modules will add themselves to it.
 cache(, super)
 
+CONFIG += build_pass   # hack to disable the .qmake.super auto-add
+load(qt_build_config)
+
 TEMPLATE      = subdirs
 
-CONFIG += prepare_docs qt_docs_targets testcase_targets
+defineReplace(moduleName) {
+    return(module_$$replace(1, -, _))
+}
 
-module_qtbase.subdir = qtbase
-module_qtbase.target = module-qtbase
+# Arguments: module name, [mandatory deps], [optional deps], [project file]
+defineTest(addModule) {
+    contains(QT_SKIP_MODULES, $$1): return(false)
+    mod = $$moduleName($$1)
 
-module_qtsvg.subdir = qtsvg
-module_qtsvg.target = module-qtsvg
-module_qtsvg.depends = module_qtbase
+    isEmpty(4) {
+        !exists($$1/$${1}.pro): return(false)
+        $${mod}.subdir = $$1
+        export($${mod}.subdir)
+    } else {
+        !exists($$1/$${4}): return(false)
+        $${mod}.file = $$1/$$4
+        $${mod}.makefile = Makefile
+        export($${mod}.file)
+        export($${mod}.makefile)
+    }
 
-module_qtxmlpatterns.subdir = qtxmlpatterns
-module_qtxmlpatterns.target = module-qtxmlpatterns
-module_qtxmlpatterns.depends = module_qtbase
+    for(d, 2) {
+        dn = $$moduleName($$d)
+        !contains(SUBDIRS, $$dn): \
+            return(false)
+        $${mod}.depends += $$dn
+    }
+    for(d, 3) {
+        dn = $$moduleName($$d)
+        contains(SUBDIRS, $$dn): \
+            $${mod}.depends += $$dn
+    }
+    !isEmpty($${mod}.depends): \
+        export($${mod}.depends)
 
-module_qtscript.subdir = qtscript
-module_qtscript.target = module-qtscript
-module_qtscript.depends = module_qtbase
+    $${mod}.target = module-$$1
+    export($${mod}.target)
 
-module_qtjsbackend.subdir = qtjsbackend
-module_qtjsbackend.target = module-qtjsbackend
-module_qtjsbackend.depends = module_qtbase
-
-module_qtdeclarative.subdir = qtdeclarative
-module_qtdeclarative.target = module-qtdeclarative
-module_qtdeclarative.depends = module_qtbase module_qtjsbackend
-
-module_qtwebkit.file = qtwebkit/WebKit.pro
-module_qtwebkit.makefile = Makefile
-module_qtwebkit.depends = module_qtbase module_qtdeclarative
-module_qtwebkit.target = module-qtwebkit
-
-module_qtwebkit_examples_and_demos.subdir = qtwebkit-examples-and-demos
-module_qtwebkit_examples_and_demos.target = module-qtwebkit-examples-and-demos
-module_qtwebkit_examples_and_demos.depends = module_qtwebkit module_qttools
-
-module_qttools.subdir = qttools
-module_qttools.target = module-qttools
-module_qttools.depends = module_qtbase
-
-module_qttranslations.subdir = qttranslations
-module_qttranslations.target = module-qttranslations
-module_qttranslations.depends = module_qttools
-
-module_qtdoc.subdir = qtdoc
-module_qtdoc.target = module-qtdoc
-module_qtdoc.depends = module_qtbase module_qtdeclarative
-
-module_qtactiveqt.subdir = qtactiveqt
-module_qtactiveqt.target = module-qtactiveqt
-module_qtactiveqt.depends = module_qtbase
-
-module_qtqa.subdir = qtqa
-module_qtqa.target = module-qtqa
-module_qtqa.depends = module_qtbase
-
-module_qtmultimedia.subdir = qtmultimedia
-module_qtmultimedia.target = module-qtmultimedia
-module_qtmultimedia.depends = module_qtbase
-
-module_qtimageformats.subdir = qtimageformats
-module_qtimageformats.target = module-qtimageformats
-module_qtimageformats.depends = module_qtbase
-
-module_qtquick1.subdir = qtquick1
-module_qtquick1.target = module-qtquick1
-module_qtquick1.depends = module_qtbase module_qtscript
-
-module_qtgraphicaleffects.subdir = qtgraphicaleffects
-module_qtgraphicaleffects.target = module-qtgraphicaleffects
-module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative
+    SUBDIRS += $$mod
+    export(SUBDIRS)
+    return(true)
+}
 
 # only qtbase is required to exist. The others may not - but it is the
 # users responsibility to ensure that all needed dependencies exist, or
 # it may not build.
 
-SUBDIRS = module_qtbase
-
-exists(qtsvg/qtsvg.pro) {
-    SUBDIRS += module_qtsvg
-    # These modules do not require qtsvg, but can use it if it is available
-    module_qtdeclarative.depends += module_qtsvg
-    module_qtquick1.depends += module_qtsvg
-}
-exists(qtxmlpatterns/qtxmlpatterns.pro) {
-    SUBDIRS += module_qtxmlpatterns
-    # These modules do not require qtxmlpatterns, but can use it if it is available
-    module_qtdeclarative.depends += module_qtxmlpatterns
-    module_qtquick1.depends += module_qtxmlpatterns
-}
-
-exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
-exists(qtdeclarative/qtdeclarative.pro) {
-    SUBDIRS += module_qtdeclarative
-    # These modules do not require qtdeclarative, but can use it if it is available
-    module_qttools.depends += module_qtdeclarative
-    module_qtmultimedia.depends += module_qtdeclarative
-}
-exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
-exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
-exists(qtactiveqt/qtactiveqt.pro) {
-    SUBDIRS += module_qtactiveqt
-    module_qttools.depends += module_qtactiveqt
-}
-exists(qtwebkit/WebKit.pro) {
-    mac|contains(QT_CONFIG, icu) {
-        SUBDIRS += module_qtwebkit
-        module_qttools.depends += module_qtwebkit
-        module_qtquick1.depends += module_qtwebkit
-        exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) {
-            SUBDIRS += module_qtwebkit_examples_and_demos
-        }
-    } else {
-        message("WebKit: Qt was built without ICU support, WebKit disabled.")
-    }
-}
-exists(qttools/qttools.pro) {
-    SUBDIRS += module_qttools
-    module_qtquick1.depends += module_qttools
-}
-exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
-exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
-exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects
-exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
-exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
-exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
+addModule(qtbase)
+addModule(qtx11extras, qtbase)
+addModule(qlalr, qtbase)
+addModule(qtsvg, qtbase)
+addModule(qtxmlpatterns, qtbase)
+addModule(qtjsbackend, qtbase)
+addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
+addModule(qtquickcontrols, qtdeclarative)
+addModule(qtmultimedia, qtdeclarative)
+addModule(qtactiveqt, qtbase)
+addModule(qt3d, qtdeclarative)
+addModule(qtjsondb, qtdeclarative)
+addModule(qtsystems, qtbase, qtdeclarative qtjsondb)
+addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia)
+addModule(qtsensors, qtbase, qtdeclarative)
+addModule(qtconnectivity, qtsystems)
+addModule(qtfeedback, qtdeclarative, qtmultimedia)
+addModule(qtpim, qtdeclarative, qtjsondb)
+addModule(qtwebkit, qtdeclarative, qtlocation 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(qtdocgallery, qtdeclarative, qtjsondb)
+!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
+addModule(qtserialport, qtbase)
+addModule(qttranslations, qttools)
+addModule(qtdoc, qtdeclarative)
+addModule(qtqa, qtbase)