Updated submodules.

Change-Id: Iba5d9c28367748258013888c93ab773eb05bb0ee Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Updated submodules.
2026-03-10 06:16:10 +08:00 · 2015-12-15 07:35:22 +00:00 · 2015-12-10 05:05:50 +00:00 · 2015-12-08 04:54:41 +00:00 · 2015-12-01 14:00:46 +00:00 · 2015-12-01 14:00:43 +00:00
38 changed files with 71 additions and 44 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -190,3 +190,7 @@
 	url = ../qtquickcontrols2.git
 	branch = 5.6
 	initrepo = true
+[submodule "qtpurchasing"]
+	path = qtpurchasing
+	url = ../qtpurchasing.git
+	branch = 5.6
--- a/27
+++ b/27
@@ -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.
--- a/gnuwin32/bin/win_bison.exe
+++ b/gnuwin32/bin/win_bison.exe
--- a/gnuwin32/bin/win_flex.exe
+++ b/gnuwin32/bin/win_flex.exe
--- a/3
+++ b/3
@@ -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
--- a/qt.pro
+++ b/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)
--- 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
--- a/1
+++ b/1
--- 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
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Simon Hausmann	a93760f957	Updated submodules. Change-Id: Iba5d9c28367748258013888c93ab773eb05bb0ee Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-12-15 07:35:22 +00:00
Simon Hausmann	d678e02936	Updated submodules. Change-Id: Ia00cca2d8c22ff96a4f871d70eaa9eb55f6391b0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-12-10 05:05:50 +00:00
Antti Kokko	1c04b1f7bd	Updated submodules. Change-Id: Ic83700e48f40b0ee8e76f4b4e44b28b4c85bebb7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-12-08 04:54:41 +00:00
Oswald Buddenhagen	2a46300588	error-check dependency declarations Change-Id: I98ad68d8be608b144c5f2ff422aaf7baab9907e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>	2015-12-01 14:00:46 +00:00
Antti Kokko	d527415ac6	Updated submodules. Change-Id: Id124a31338548d9a76baa908b281b3bb6ede168a Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>	2015-12-01 14:00:43 +00:00
Frederik Gladhorn	f128a9a7e1	Updated submodules. Change-Id: Id3463e24f1aecc6e2d4d040bc7878ad1d48f6327 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-11-16 05:29:51 +00:00
Oswald Buddenhagen	83b45e9030	declare mandatory dep serialbus => serialport Change-Id: I35c5f18b7c8856071413e50590308f402be7e528 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>	2015-11-13 09:22:22 +00:00
Jędrzej Nowacki	1197dbb1db	Updated submodules. Change-Id: I8e348f3cab39f75acb68b2bdc388cd37927424bb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-11-12 19:05:33 +00:00
Frederik Gladhorn	d55a9e3a66	Updated submodules. Change-Id: I0793599392d2e64ceabe8d0f24ba7cb0abc76b84 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>	2015-11-07 14:00:12 +00:00
Jani Heikkinen	4aabf3e19d	Updated submodules. Change-Id: I4f71eed2d556219480490f433323db4c151b4ba7 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-10-31 09:29:59 +00:00
Fredrik Orderud	ddcc9b234e	Update Qt3d manually Fixes a crash at destruction. Change-Id: Ie773b3def96cc1e55baa36b9ff7cf697770d479e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>	2015-10-28 20:25:26 +00:00
Simon Hausmann	95a89a8b5a	Manual update of qtmultimedia In order to bring in the missing libs for QTBUG-48914 Change-Id: I678dcd1ca5bdae66efdd09b809ff63c7da37d58a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-10-27 12:15:41 +00:00
Fredrik Orderud	98717e27d0	Update Qt3d manually Fixes some nasty threading problems related to pick event race conditions and QThreadPool thread recycling. Change-Id: I977ad310d1a767abc0fbcca49f9088ff5fdda708 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-10-26 18:22:04 +00:00
Simon Hausmann	5197447fd0	Update WebEngine manually This brings in MSVC 2015 fixes and RHEL/OpenSuSE build fixes Change-Id: I796c153a005e964c4a32203cfe08cbf3ece5f39e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-10-23 18:46:03 +00:00
Laszlo Agocs	a0309a7a43	Fix dependency order for qtlocation and qtwebview Change-Id: Ie61b69be3b38975675fff3553d1f5c9510e7865e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>	2015-10-22 05:00:55 +00:00
Simon Hausmann	17c6369c9e	Updated submodules. Change-Id: I3094692e61e5a41116d69053d1f296eac46e545b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-10-22 05:00:52 +00:00
Jani Heikkinen	6f0713adf6	Updated submodules. Change-Id: Ifc06de16a694d8d24bdea3a81e796a0c460e1864 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-10-12 10:43:55 +00:00
Oswald Buddenhagen	0c4ec778f5	declare qtgraphicaleffects before qtquickcontrols otherwise the dependency is botched. amends `30e19df5b`. Change-Id: I8e17d2f91c7c55c49be6239268f928ae4577d17c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>	2015-10-12 05:25:39 +00:00
Iikka Eklund	6382845a6d	Update build instructions for commercial licensees Add build instructions for commercial licensees as well so that the same README covers both opensource and enterprise users. This removes the need having separate README file for commercial users. Change-Id: Ibd3012b428c6fa85f47c1c459d8029ebfce92046 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>	2015-10-12 05:25:20 +00:00
Edward Welbourne	383b2585e3	Explain what the canonical URLs are. This caught me out the first time I tried to use init-repository. Documentation should work for noobs. Change-Id: Ia6c9ce395ace034128bfe80f2c31be7f9cd4cf35 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>	2015-10-12 05:24:50 +00:00
Laszlo Agocs	ee443af314	Add qtserialport as dependency for qtlocation Task-number: QTBUG-48082 Change-Id: I7b90777bfdd1286f6340caf756562146772d0bb3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>	2015-10-09 12:05:04 +00:00
Jani Heikkinen	d16a8656f9	Updated submodules. Change-Id: I871b519649bb6130db128d7ae4c0916ee2e48146 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-10-06 17:21:56 +00:00
Simon Hausmann	c78fc65631	Updated submodules. Change-Id: Ia0a52a43a8c5fa7516c1469241a449c457153040 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-09-26 11:22:38 +00:00
Simon Hausmann	ae1dc7aa3e	Updated submodules. Change-Id: Ic5ea73d6ca0ea2e174cd592226a16885a73aeed1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-09-25 19:35:21 +00:00
Thiago Macieira	942ae1dd82	Add a way to build just a few of Qt's modules more easily The current way requires passing -skip to configure, which is a list of what not to build. To set a list of what to build (e.g., for testing, in a specialized build, etc.), there was no way. Now you can just do: qmake "QT_BUILD_MODULES=qtbase qtdeclarative qtsvg qtxmlpatterns" (the order doesn't matter) Change-Id: Ifcaefa35b16b137866ca839a483ce366e35de7ab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>	2015-09-24 05:22:45 +00:00
Frederik Gladhorn	d7f477d1cd	Add qtpurchasing as non-default module For 5.6 this is a tech preview, it will be added properly in 5.7. Change-Id: I709830fbcfc439d5446718093f0c16ad2dcb1e57 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>	2015-09-24 05:22:42 +00:00
Simon Hausmann	c42dd3462b	Updated submodules. Change-Id: If0045fccac1af79e858831c75c7808fe6997e37e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>	2015-09-22 16:40:33 +00:00
Jani Heikkinen	944aa6bcbb	Updated submodules. Change-Id: I3c4cdbef3f8fbc016757fdd6a4b5bb8eb6a644df Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-09-21 13:24:01 +00:00
Simon Hausmann	a89c6ef703	Manual update of qttools to remove webkit dependency Change-Id: I6cf6ae75cedb0945c46fd9b3fa63bd21a9ce4806 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-09-18 06:33:36 +00:00
Simon Hausmann	2ebfdb4ca8	Updated submodules. Change-Id: I03bbaedeb88ad76df39ce10f6828ebf5c8b8dadf Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-09-17 11:37:09 +00:00
Oswald Buddenhagen	9bde440225	Merge remote-tracking branch 'origin/5.5' into 5.6 Change-Id: I7a28bcaeb5538763274fdef20f8c8ca81b9b21ad	2015-09-10 14:24:15 +02:00
Qt Submodule Update Bot	dd1aeea722	Updated submodules. Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-09-04 04:24:15 +00:00
Andrew Knight	7bbe464617	gnuwin32: remove win_bison/win_flex These tools are copies of bison/flex and are no longer needed. Change-Id: Ia543926ee8126358beee2aed03752d9cfe803f07 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>	2015-09-01 05:56:07 +00:00
Qt Submodule Update Bot	0ba6e6ce43	Updated submodules. Change-Id: I1497a398e34e18abb18f705b2294464840629ca1 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-09-01 05:56:00 +00:00
Qt Submodule Update Bot	1497a398e3	Updated submodules. Change-Id: I56e7af096e889d56ef67baabf38529c0ccb8d8b5 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-08-25 04:33:00 +00:00