Compare commits

...

63 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
1d5ed0cde0 Updated submodules.
Change-Id: Ie8b2bd3e407893b1f97b7bde3fcfb122eba1f711
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-06-12 20:54:11 +00:00
Qt Submodule Update Bot
ab98909d73 Updated submodules.
Change-Id: Ie34d9b7e565b0354777676a557dd4b606723a510
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2016-06-11 18:28:21 +00:00
Qt Submodule Update Bot
5256e979fd Updated submodules.
Change-Id: I81483e4ea1f73d2cb4d427cd7b052c7c1c1a79d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-06-10 10:19:52 +00:00
Qt Submodule Update Bot
6a4d5e4bc8 Updated submodules.
Change-Id: Ia6457dbccce18d960274b0a1774c3d646dfbc6b9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-06-07 17:59:57 +00:00
Qt Submodule Update Bot
801066c40d Updated submodules.
Change-Id: If3be9830f7bdbb5508e3b3a962afcc7402b433b2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-06-03 06:24:37 +00:00
Qt Submodule Update Bot
e96f60a228 Updated submodules.
Change-Id: I5093e1ed41b58628b9a67e3bc8c9ed737c9e5523
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-05-30 10:07:21 +00:00
Qt Submodule Update Bot
4e02d96116 Updated submodules.
Change-Id: I89a5dc174641a9e4fc7c99e31794c92575179c49
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-05-30 08:13:51 +00:00
Qt Submodule Update Bot
0c66994ae9 Updated submodules.
Change-Id: Ia44a5bc2e6e42cd00524dc82c01d5f59726475f3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-05-28 07:36:05 +00:00
Simon Hausmann
ad474f110f Fix status of qtquick1 and enginio
The right term is "ignore" in order to ignore the module, not "ignored".

Change-Id: Idd4a887834fc98fffb2b9e8385308aa676ba3adf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-05-26 23:13:14 +00:00
Jani Heikkinen
30f22b8351 Set qtquick and enginio to ignored state
It was agreed at the Qt Contributor Summit 2015 that QtQuick1 will be
removed completely from the packages and not even compiled during
qt5.git integration.

Enginio is also removed from 5.7.0 so ignoring it as well

Change-Id: I80ac88d28f811fbf731e33d4d4353a249ad6d29a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-05-24 11:53:12 +00:00
Oswald Buddenhagen
23824d231b Adjust submodule branches
Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812
2016-05-13 13:28:52 +02:00
Oswald Buddenhagen
777967f97b Merge remote-tracking branch 'origin/5.6' into 5.7
skipped all sha1 updates.

Change-Id: I1f741cf7bea806ab238b4f1b5585bb440dafd4f7
2016-05-13 13:22:16 +02:00
Qt Submodule Update Bot
868e545eb2 Updated submodules.
Change-Id: Iac472068ce186e1e1a0a8a58c7050451171eee37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-11 18:54:26 +00:00
Qt Submodule Update Bot
9812986913 Updated submodules.
Change-Id: I092e0b94eb77397708ab6d196357ec6b3b141326
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-11 13:58:19 +00:00
Qt Submodule Update Bot
c07377e739 Updated submodules.
Change-Id: I5ea896b0ec6b9837fda44eb7b7a61aa3c6e42db5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-09 04:09:45 +00:00
Frederik Gladhorn
cef159accd Add script to install freeopcua on Ubuntu 14.04
Change-Id: Ia13362cf9aa17fbc0e85ac61b1f2897101903aaf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-06 10:43:53 +00:00
Oswald Buddenhagen
a1ec8795c6 make it actually possible to specify 'ignore' as a class
another thing the doc claims to be possible - also quite reasonably.

Change-Id: I2220245b10f02a778345b6549e345b2486630ffd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-05 20:02:39 +00:00
Oswald Buddenhagen
c41d854254 make it actually possible to exclude classes
the doc - quite reasonably - claims that it is possible.

Change-Id: I4668b3feafe721f1db4deb65848206d8197962c8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-05 20:02:38 +00:00
Qt Submodule Update Bot
9b9801b7d4 Updated submodules.
Change-Id: I6230a59c886114184d74ad34651f04f0d296ade0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-05 05:40:27 +00:00
Frederik Gladhorn
3afd172a25 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If598cf5987b52450a43fab93702b717c96b17ad2
2016-04-28 12:25:11 +02:00
Jędrzej Nowacki
3963056f63 Add script that install icu on RHEL 6.6
That is translation from coin-setup golang code to sh script

Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2016-04-28 07:54:50 +00:00
Frederik Gladhorn
54f1bfd10c Add script to install jom through powershell
Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-04-28 07:54:48 +00:00
Frederik Gladhorn
2aff311423 Add coin provisioning directory
Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-04-26 15:50:53 +00:00
Qt Submodule Update Bot
d61ac6c2f0 Updated submodules.
Change-Id: I1586fb62199695f918f016ec9437810b0f9515e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-04-25 08:15:10 +00:00
Qt Submodule Update Bot
b7c2e9a846 Updated submodules.
Change-Id: Id24e1017eee9828e7d6245f1241f241662cc48ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-04-21 05:55:42 +00:00
Iikka Eklund
3df0a5837c Update qtquickcontrols2 status as "addon" for Qt 5.7
qtquickcontrols2 is not in preview state anymore for Qt 5.7.

Change-Id: Ib9d3616e7605beabb9bb9f0b0cb1b79a8d499ebd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-04-21 05:55:37 +00:00
Qt Submodule Update Bot
499c5390b3 Updated submodules.
Change-Id: I72e29c8b66acba249f6a274e6428e00a9804b4dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-04-21 04:26:15 +00:00
Dominik Holland
a9752d68ed Added qtdeclarative and qtmultimedia as optional dependencies for qtspeech
Change-Id: I20602133a2156b162e99432f868e4925469c7ff5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2016-04-13 14:00:38 +00:00
Qt Submodule Update Bot
e23b244494 Updated submodules.
Change-Id: I875e16060956af433e20acff4fbdcfb54d0d9923
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-04-13 14:00:35 +00:00
Qt Submodule Update Bot
273e5b82cf Updated submodules.
Change-Id: Idc9529f02cc9a5ad4cd300a745b559fea9c94ed4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-04-11 06:57:46 +00:00
Jani Heikkinen
7251401281 Update 5.7 module status
In Qt 5.7 enginio is obsolete and Qt3D addon, not TP anymore

Change-Id: I019f76162cfcc853b542695245a983f151f1b072
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2016-04-11 06:57:42 +00:00
Liang Qi
5758a88e59 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	.gitmodules

Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
2016-04-05 09:52:18 +02:00
Qt Submodule Update Bot
e80d89059c Updated submodules.
Change-Id: I983429d487f7667c36553d24037639abee660b42
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-04-04 13:21:35 +00:00
Qt Submodule Update Bot
a550ad21bf Updated submodules.
Change-Id: I1c0bcd2c582276c04e44e88169807cc7cf5b43c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-04-04 07:23:53 +00:00
Liang Qi
c80e96bb09 Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
	.gitmodules

Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
2016-03-31 09:53:10 +02:00
Qt Submodule Update Bot
f05fece2f7 Updated submodules.
Change-Id: I85bb46a7180a32c1808574d0a54c51703d4cee12
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-29 10:38:52 +00:00
Qt Submodule Update Bot
d9beab9abd Updated submodules.
Change-Id: Ie0c625f6a48fe8d05150bd12f4d92beb2a359ec7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-29 04:19:17 +00:00
Qt Submodule Update Bot
20dcf55e7d Updated submodules.
Change-Id: I5622046dbc1f8eee0cda929627fb8873d525b02a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-08 18:24:09 +00:00
Qt Submodule Update Bot
53b920dc69 Updated submodules.
Change-Id: I94c3646dc3309f71f577c6f41241cb2570d0c598
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-03-03 10:05:02 +00:00
BogDan Vatra
534d63e652 QQC2 doesn't depend on QQC1
QQC2 depends on qtgraphicaleffects.

Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-28 06:41:54 +00:00
Qt Submodule Update Bot
e785abbec1 Updated submodules.
Change-Id: Id60487a24eb193207d4d8837a91cef1abc19f97f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-25 18:49:52 +00:00
Qt Submodule Update Bot
211080722e Updated submodules.
Change-Id: I633ba6875269578aae2f9d28062d3fa78924a5fc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-24 15:41:25 +00:00
Simon Hausmann
30236c3f15 Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7 2016-02-24 15:41:16 +00:00
BogDan Vatra
18e84e7c06 Enable QtGamepad usage in Qt3D
If Qt3D finds QtGamepad, it will use it to build gamepad support.

Change-Id: Ifbc40e5e04a6030d25c2d429878d4fb3a3dd11a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-02-22 12:40:29 +00:00
Simon Hausmann
d4bb786963 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I2bc1389ece7f12efc334f0292edbbea837f9adc2
2016-02-19 09:21:52 +01:00
Oswald Buddenhagen
fdf1b3cc8d rework hook installation
the primary purpose of this change is making it work with new-style
submodules (1.7+) and git-worktree (2.5+). this means resolving '.git'
and 'commondir' files.

we avoid calling git commands, because a) it's slow on windows, b) some
of them are unavailable in older git versions and it's tedious to deal
with that and c) their output is not necessarily optimal (not always
absolute paths).

we also don't use relative paths for the hook locations any more, as
that's too tedious to deal with.

Change-Id: Ie341e748e56d6bef40856e4a49ac368850028d83
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-17 20:18:48 +00:00
Qt Submodule Update Bot
c2549708e5 Updated submodules.
Change-Id: I020482ae1107cdd56fad485007622cb4b62b8032
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-17 20:18:34 +00:00
Qt Submodule Update Bot
3fa8726fa7 Updated submodules.
Change-Id: I5861620b6214dc5ff124672ce21dd4dd5b25ce85
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-15 06:57:00 +00:00
Oswald Buddenhagen
81523d838c Adjust submodule branches
Change-Id: I3484da8952951d818e9f584bf9b57e9bb9b1e430
2016-02-12 17:40:00 +01:00
Qt Submodule Update Bot
7a8c874231 Updated submodules.
Change-Id: I6901259b7a01e57d0c8ca2a9f40d9501635f5cc0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-12 11:11:07 +00:00
Simon Hausmann
e52c7efa4c Fix datavis3d dependencies
The qtmultimedia dependency was missing for datavis3d.

Change-Id: I91007c210e58aa9985844a8234781356391bfbad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-02-12 11:11:01 +00:00
Oswald Buddenhagen
c6d04d68bd add qtgamepad, qtscxml, and qtspeech
Change-Id: I14bc475d44367a9102e896976eba5bd191ee232d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-12 11:10:57 +00:00
Oswald Buddenhagen
4007fc7a26 Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
	.gitmodules

Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
2016-02-12 11:18:27 +01:00
Miikka Heikkinen
2c53e3d08c Add charts, data visualization and virtual keyboard modules
Change-Id: I53cbc4ce3c2e44687ce454498f5def820614db85
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-25 14:41:07 +00:00
Qt Submodule Update Bot
b93073ecc9 Updated submodules.
Change-Id: I790e982492004e93953bed503a1d777d27c28b6f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-23 11:12:30 +00:00
Simon Hausmann
d758a3b055 Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
2016-01-22 10:42:38 +01:00
Simon Hausmann
d2b26ede9c Updated submodules.
Change-Id: I5d7279982a017ef903991faa89c79ca10e717497
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-17 21:01:44 +00:00
Liang Qi
2051c2987e Enable qtpurchasing by default
Change-Id: I4030b9f446a865e758492e2f07b8adb19052e91d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2015-12-16 20:08:35 +00:00
Liang Qi
c485f3e4a7 Manually update qtpurchasing
Change-Id: I7385116d7c6e9a7f9b7b2be4b76468b8459299dd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-16 09:38:11 +00:00
Liang Qi
7b30d85bdc Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ibd5caf0448c9eba9251bc9395fe647f1955743f0
2015-12-15 19:05:02 +01:00
Liang Qi
e4ff528bb6 Updated submodules.
Change-Id: I54527e1c5ad138ac63d38d8eabcf158d11b0286d
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-12-15 12:13:58 +00:00
Qt Submodule Update Bot
a2a6cf11a7 Updated submodules.
Change-Id: I1d3966833b5f27fb262f2d3727557ef2c8947828
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-09-21 18:02:48 +00:00
Oswald Buddenhagen
2068af50ca Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	.gitmodules
	qtquickcontrols2
	qtwebview

Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
2015-09-18 12:00:07 +02:00
59 changed files with 384 additions and 107 deletions

124
.gitmodules vendored
View File

@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.6.0
branch = 5.7.0
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.6.0
branch = 5.7.0
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.6.0
branch = 5.7.0
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.6.0
branch = 5.7.0
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools
url = ../qttools.git
branch = 5.6.0
branch = 5.7.0
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.6.0
branch = 5.7.0
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
branch = 5.6.0
branch = 5.7.0
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -74,7 +74,7 @@
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
path = qtwebkit
url = ../qtwebkit.git
branch = 5.6.0
branch = 5.7.0
status = obsolete
project = WebKit.pro
priority = 20
@@ -82,7 +82,7 @@
depends = qtwebkit qttools
path = qtwebkit-examples
url = ../qtwebkit-examples.git
branch = 5.6.0
branch = 5.7.0
status = obsolete
[submodule "qtqa"]
depends = qtbase
@@ -96,21 +96,21 @@
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
path = qtlocation
url = ../qtlocation.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtsystems"]
depends = qtbase
recommends = qtdeclarative
path = qtsystems
url = ../qtsystems.git
branch = dev
branch = 5.7
status = ignore
[submodule "qtfeedback"]
depends = qtdeclarative
@@ -129,142 +129,184 @@
depends = qtdeclarative
path = qtpim
url = ../qtpim.git
branch = dev
branch = 5.7
status = ignore
[submodule "qtconnectivity"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
recommends = qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.6.0
status = preview
branch = 5.7.0
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = 5.6.0
status = obsolete
branch = 5.7.0
status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.6.0
branch = 5.7.0
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.6.0
branch = 5.7.0
status = preview
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
path = qtenginio
url = ../qtenginio.git
branch = 5.6.0
status = deprecated
branch = 5.7.0
status = ignore
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation
path = qtwebengine
url = ../qtwebengine.git
branch = 5.6.0
branch = 5.7.0
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.6.0
branch = 5.7.0
status = addon
[submodule "qtquickcontrols2"]
depends = qtquickcontrols
depends = qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.6.0
status = preview
branch = 5.7.0
status = addon
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.7.0
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.7.0
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.7.0
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.7.0
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad
branch = 5.7.0
status = preview
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml
branch = 5.7.0
status = preview
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech
branch = dev
status = ignore

9
coin/README Normal file
View File

@@ -0,0 +1,9 @@
Continuous Integration
======================
This directory contains files used by Qt's Continuous Integration system (Coin).
provisioning
------------
Contains scripts that apply to different test machines in order to run automatic tests on them.

View File

@@ -0,0 +1,31 @@
function Verify-Checksum
{
Param (
[string]$File=$(throw("You must specify a filename to get the checksum of.")),
[string]$Expected=$(throw("Checksum required")),
[ValidateSet("sha1","md5")][string]$Algorithm="sha1"
)
$fs = new-object System.IO.FileStream $File, "Open"
$algo = [type]"System.Security.Cryptography.$Algorithm"
$crypto = $algo::Create()
$hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "")
$fs.Close()
if ($hash -ne $Expected) {
Write-Error "Checksum verification failed, got: '$hash' expected: '$Expected'"
}
}
function Extract-Zip
{
Param (
[string]$Source,
[string]$Destination
)
echo "Extracting '$Source' to '$Destination'..."
New-Item -ItemType Directory -Force -Path $Destination
$shell = new-object -com shell.application
$zipfile = $shell.Namespace($Source)
$destinationFolder = $shell.Namespace($Destination)
$destinationFolder.CopyHere($zipfile.Items())
}

View File

@@ -0,0 +1,7 @@
. "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\jom_1_1_0.zip"
Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip
Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832"
Extract-Zip $zip C:\Utils\Jom

View File

@@ -0,0 +1,70 @@
#!/bin/env bash
#############################################################################
##
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script installs the right ICU version
set -e
icuVersion="56.1"
icuLocation="/usr/lib64"
sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
function Install7ZPackageFromURL {
url=$1
expectedSha1=$2
targetDirectory=$3
targetFile=`mktemp` || echo "Failed to create temporary file"
wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive"
rm $targetFile
}
echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
echo "Installing custom ICU devel packages on RHEL"
sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
tempDir=`mktemp -d` || echo "Failed to create temporary directory"
trap "sudo rm -fr $tempDir" EXIT
Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
sudo cp -a $tempDir/lib/* /usr/lib64
sudo cp -a $tempDir/* /usr/
sudo /sbin/ldconfig

View File

@@ -0,0 +1,4 @@
# provides: odbc devel packages on RHEL
# version: provided by default Linux distribution repository
# needed for configure -plugin-sql-odbc in qtbase
sudo yum install -y unixODBC-devel

View File

@@ -0,0 +1,49 @@
#!/bin/env bash
#############################################################################
##
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
sudo apt-get update
sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev
TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
trap "sudo rm -fr $TEMPDIR" EXIT
cd $TEMPDIR
git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua
cd freeopcua
git checkout 57b6993d39b6761af773fa4fa37c3fbd39c764f1
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..
make
sudo make install

View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\jom.ps1"
Set-ExecutionPolicy Restricted -Force

View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\jom.ps1"
Set-ExecutionPolicy Restricted -Force

View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\jom.ps1"
Set-ExecutionPolicy Restricted -Force

View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\jom.ps1"
Set-ExecutionPolicy Restricted -Force

View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\jom.ps1"
Set-ExecutionPolicy Restricted -Force

View File

@@ -157,7 +157,10 @@ EOF
use Carp qw( confess );
use English qw( -no_match_vars );
use Getopt::Long qw( GetOptions );
use Cwd qw( getcwd );
use Cwd qw( getcwd abs_path );
my $script_path = abs_path($0);
$script_path =~ s,[/\\][^/\\]+$,,;
my $GERRIT_SSH_BASE
= 'ssh://@USER@codereview.qt-project.org@PORT@/';
@@ -330,26 +333,36 @@ sub git_clone_all_submodules
my %include = ();
foreach my $mod (@subset) {
my $del = ($mod =~ s/^-//);
my $fail = 0;
my @what;
if ($mod eq "all") {
map { $include{$_} = 1; } keys %subbases;
@what = keys %subbases;
} elsif ($mod eq "essential") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases;
@what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases;
} elsif ($mod eq "addon") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
@what = grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
} elsif ($mod eq "preview") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
@what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
} elsif ($mod eq "deprecated") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases;
@what = grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases;
} elsif ($mod eq "obsolete") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases;
} elsif ($mod =~ s/^-//) {
@what = grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases;
} elsif ($mod eq "ignore") {
@what = grep { ($subinits{$_} || 0) eq 0 } keys %subbases;
} elsif (defined($subdirs{$mod})) {
push @what, $mod;
} else {
$fail = 1;
}
if ($del) {
print "Warning: excluding non-existent module '$mod'.\n"
if (!defined($subdirs{$mod}));
delete $include{$mod};
if ($fail);
map { delete $include{$_} } @what;
} else {
die("Error: module subset names non-existent '$mod'.\n")
if (!defined($subdirs{$mod}));
$include{$mod} = 1;
if ($fail);
map { $include{$_} = 1; } @what;
}
}
@@ -522,11 +535,16 @@ sub ensure_link
return if (!$self->{'force-hooks'} and -f $tgt);
unlink($tgt); # In case we have a dead symlink or pre-existing hook
print "Aliasing $src\n as $tgt ...\n" if (!$self->{quiet});
return if eval { symlink($src, $tgt) };
if ($^O ne "msys" && $^O ne "MSWin32") {
return if eval { symlink($src, $tgt) };
}
# Windows doesn't do (proper) symlinks. As the post_commit script needs
# them to locate itself, we write a forwarding script instead.
open SCRIPT, ">".$tgt or die "Cannot create forwarding script $tgt: $!\n";
print SCRIPT "#!/bin/sh\nexec `dirname \$0`/$src \"\$\@\"\n";
# Make the path palatable for MSYS.
$src =~ s,\\,/,g;
$src =~ s,^(.):/,/$1/,g;
print SCRIPT "#!/bin/sh\nexec $src \"\$\@\"\n";
close SCRIPT;
}
@@ -534,19 +552,30 @@ sub git_install_hooks
{
my ($self) = @_;
return if (!-d 'qtrepotools/git-hooks');
my $hooks = $script_path.'/qtrepotools/git-hooks';
return if (!-d $hooks);
# Force C locale as git submodule returns the localized string "Entering"
local $ENV{LC_ALL} = 'C';
chomp(my @modules = `git submodule foreach :`);
push @modules, "";
for my $module (@modules) {
$module =~ s,^Entering \'([^\']+)\'$,$1/,;
my $rel = $module;
$rel =~ s,[^/]+,..,g;
$rel .= "../../qtrepotools/git-hooks/";
$self->ensure_link($rel.'gerrit_commit_msg_hook', $module.'.git/hooks/commit-msg');
$self->ensure_link($rel.'git_post_commit_hook', $module.'.git/hooks/post-commit');
my @configresult = qx(git config --list --local);
foreach my $line (@configresult) {
next if ($line !~ /submodule\.([^.=]+)\.url=/);
my $module = $1.'/.git';
if (!-d $module) {
open GITD, $module or die "Cannot open $module: $!\n";
my $gd = <GITD>;
close GITD;
chomp($gd);
$gd =~ s/^gitdir: // or die "Malformed .git file $module\n";
$module = $gd; # We expect it to be always absolute.
if (open COMD, $module.'/commondir') {
my $cd = <COMD>;
chomp($cd);
$module .= '/'.$cd;
$module = abs_path($module);
close COMD;
}
}
$self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg');
$self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit');
}
}

2
qt3d

Submodule qt3d updated: 7a208d76ed...eb3fed53f7

2
qtbase

Submodule qtbase updated: d0cdc7ad1e...6c1e352803

1
qtcharts Submodule

Submodule qtcharts added at 0464d42b10

1
qtdatavis3d Submodule

Submodule qtdatavis3d added at 643a6ad187

2
qtdoc

Submodule qtdoc updated: 2ed0ac4bbb...de0e539c44

1
qtgamepad Submodule

Submodule qtgamepad added at 0295c81fdf

2
qtpim

Submodule qtpim updated: fa74ad6eda...de4cfc6b53

2
qtqa

Submodule qtqa updated: 683f523bcc...32893be6fa

1
qtscxml Submodule

Submodule qtscxml added at 05e6410385

1
qtspeech Submodule

Submodule qtspeech added at ca8768b90c

2
qtsvg

Submodule qtsvg updated: 38777ea745...d39db072e4

Submodule qttools updated: 9904992dc4...4c1d5c0416

1
qtvirtualkeyboard Submodule

Submodule qtvirtualkeyboard added at 5e45faaf05