Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Ibd5caf0448c9eba9251bc9395fe647f1955743f0

.gitmodules

@@ -190,3 +190,7 @@
 	url = ../qtquickcontrols2.git
 	branch = dev
 	initrepo = true
+[submodule "qtpurchasing"]
+	path = qtpurchasing
+	url = ../qtpurchasing.git
+	branch = dev

README

@@ -39,11 +39,24 @@ HOW TO BUILD QT5
      The "bin" folder of the ICU installation should be appended to the PATH
      environment variable in order to for the DLLs to be found at run-time.
 
+   Licensing:
+   ----------
+
+    Opensource users:
+
+        <source_package> = qt-everywhere-opensource-src-<version>
+        <license>        = -opensource
+
+    Commercial users:
+
+        <source_package> = qt-everywhere-enterprise-src-<version>
+        <license>        = -commercial
+
    Linux, Mac:
    -----------
 
-     cd <path>/qt-everywhere-opensource-src-<version>
-     ./configure -prefix $PWD/qtbase -opensource -nomake tests
+     cd <path>/<source_package>
+     ./configure -prefix $PWD/qtbase <license> -nomake tests
      make -j 4
 
    Windows:
@@ -55,8 +68,8 @@ HOW TO BUILD QT5
      * 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
+     cd <path>\<source_package>
+     configure -prefix %CD%\qtbase <license> -nomake tests
      nmake // jom // mingw32-make
 
      To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
@@ -81,13 +94,13 @@ HOW TO BUILD QT5
  Example for a release build:
  (adjust the `-jN' parameter as appropriate for your system)
 
-   ./configure -prefix $PWD/qtbase -opensource
+   ./configure -prefix $PWD/qtbase <license>
    make -j4
 
  Example for a developer build:
  (enables more autotests, builds debug version of libraries, ...)
 
-   ./configure -developer-build -opensource
+   ./configure -developer-build <license>
    make -j4
 
  See output of `./configure -help' for documentation on various options to
@@ -100,7 +113,7 @@ HOW TO BUILD QT5
  a `make module-<foo>'.  For example, to build only qtscript and qtwebkit,
  and the modules they depend on:
 
-   ./configure -prefix $PWD/qtbase -opensource
+   ./configure -prefix $PWD/qtbase <license>
    make -j4 module-qtscript module-qtwebkit
 
  This can save a lot of time if you are only interested in a subset of Qt5.

init-repository

@@ -48,7 +48,8 @@ init-repository - initialize the Qt5 repository and all submodules
   ./init-repository [options]
 
 This script may be run after an initial `git clone' of Qt5 in order to check
-out all submodules.
+out all submodules.  It fetches them from canonical URLs inferred from the
+clone's origin.
 
 
 =head1 OPTIONS

qt.pro

@@ -13,7 +13,14 @@ defineReplace(moduleName) {
 
 # Arguments: module name, [mandatory deps], [optional deps], [project file]
 defineTest(addModule) {
+    for(d, $$list($$2 $$3)): \
+        !contains(MODULES, $$d): \
+            error("'$$1' depends on not (yet) declared '$$d'.")
+    MODULES += $$1
+    export(MODULES)
+
     contains(QT_SKIP_MODULES, $$1): return(false)
+    !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$1): return(false)
     mod = $$moduleName($$1)
 
     isEmpty(4) {
@@ -58,41 +65,42 @@ ANDROID_EXTRAS =
 android: ANDROID_EXTRAS = qtandroidextras
 
 addModule(qtbase)
-addModule(qtwebview, qtdeclarative, qtwebengine)
 addModule(qtandroidextras, qtbase)
 addModule(qtmacextras, qtbase)
 addModule(qtx11extras, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
 addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
+addModule(qtgraphicaleffects, qtdeclarative)
 addModule(qtquickcontrols, qtdeclarative, qtgraphicaleffects)
 addModule(qtquickcontrols2, qtquickcontrols)
 addModule(qtmultimedia, qtbase, qtdeclarative)
 addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
 addModule(qtactiveqt, qtbase)
 addModule(qtsystems, qtbase, qtdeclarative)
-addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtsystems)
 addModule(qtsensors, qtbase, qtdeclarative)
 addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative)
 addModule(qtwebsockets, qtbase, qtdeclarative)
 addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
+addModule(qtserialport, qtbase)
+addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtserialport qtsystems)
 addModule(qtwebkit, qtbase, qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns, WebKit.pro)
 addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
 addModule(qtwebkit-examples, qtwebkit qttools)
 addModule(qtimageformats, qtbase)
 addModule(qt3d, qtdeclarative qtimageformats)
 addModule(qtcanvas3d, qtdeclarative)
-addModule(qtgraphicaleffects, qtdeclarative)
 addModule(qtscript, qtbase, qttools)
 addModule(qtquick1, qtscript, qtsvg qtxmlpatterns)
 addModule(qtdocgallery, qtdeclarative)
 addModule(qtwayland, qtbase, qtdeclarative)
-addModule(qtserialbus, qtbase)
-addModule(qtserialport, qtbase)
+addModule(qtserialbus, qtserialport)
 addModule(qtenginio, qtdeclarative)
 addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation)
+addModule(qtwebview, qtdeclarative, qtwebengine)
+addModule(qtpurchasing, qtbase, qtdeclarative)
 addModule(qttranslations, qttools)
 addModule(qtdoc, qtdeclarative)
 addModule(qtqa, qtbase)