Commit Graph

120 Commits

Author SHA1 Message Date
Tasuku Suzuki
933688fc39 Change qt3d dependency on qtimageformats to optional
only examples use webp from qtimageformats.

Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-05-04 17:36:51 +00:00
Oswald Buddenhagen
40b07da194 make sure that all submodule urls end in .git
http(s) needs that.

Started-by: Alvaro Denis <denisacostaq@gmail.com>
Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-05-02 17:16:25 +00:00
Liang Qi
b80fa7bc4c Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	.gitmodules
	qt.pro

Commit ed8f84f149 (webengine needs tools)
together with commit 5656b4848e (webkit
needs webengine) creates a circular dependency with qttools also
depending on webkit. So this commit breaks it by swapping the
serialization order between webkit and webengine.

Change-Id: I36309908adb754072495e02785ad158f8b389548
2017-04-08 19:51:16 +00:00
Oswald Buddenhagen
5656b4848e serialize build of qtwebkit and qtwebengine
linking both at the same time requires more than my 16GB of RAM, so
introduce a .gitmodules field which serializes the two.
in practice, it is just interpreted as an optional dependency. the CI
system won't be taught about it, so this will not cause an unnecessary
serialization there.

Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-06 21:56:25 +00:00
Paolo Angelelli
88e87fe7d3 Recommend qtquickcontrols2 for qtlocation
The MapViewer example now uses qtquickcontrols2 sliders.
This patch adds the related dependency

Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2017-03-14 07:03:14 +00:00
Liang Qi
ad3c519525 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
2017-03-04 22:21:23 +01:00
Oswald Buddenhagen
ed8f84f149 declare optional dependency of qtwebengine on qttools
starting with 5.7, it optionally comes with a qt designer plugin.

Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2017-02-23 09:48:32 +00:00
Brett Stottlemyer
dc4ec9c5d9 Add qtremoteobjects
Change-Id: Ie7e673d95b4930a93fc6d1a4aa86241061001bc2
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-10 00:17:37 +00:00
Jani Heikkinen
6c76752673 Change qtgamepad status from preview to addon
qtgamepad will be officially supported with Qt 5.9

Change-Id: I3f941189881f2ab32ef10d4fff242e0d075798f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-10 00:17:33 +00:00
Simon Hausmann
527829a600 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
2017-02-05 15:17:50 +01:00
Simon Hausmann
d641d6546b Merge remote-tracking branch 'origin/5.6' into 5.8
Conflicts:
	coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh

Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
2017-02-03 09:15:43 +01:00
Frederik Gladhorn
713188e4af Revert "Clean up usage of qtsvg as dependency"
qtdeclarative has a runtime dependency, some tests rely on the svg
module being available, so in order to not reduce the test coverage,
revert this change.
I'd like to see a better/cleaner separation, but for the time being,
better coverage wins.

This reverts commit fbd782636b.

Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-03 05:46:43 +00:00
Oswald Buddenhagen
29a926f941 Adjust submodule branches
Change-Id: Ifd38a97f7b51138504e8d7ace030a175640bc216
2017-01-25 11:39:31 +01:00
Simon Hausmann
a34d812580 Merge remote-tracking branch 'origin/5.8' into dev
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
dev branch.

This is done within the same change as the merge to preserve atomicity.

Task-number: QTQAINFRA-1074
Change-Id: Ic47f7db3506ace4faca028b902d48cdb009c8495
2017-01-14 08:40:10 +01:00
Liang Qi
97e6ed74e4 Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
	.gitmodules

Change-Id: I749924de83f87e436448bf1287fe057e2fe4c45b
2016-12-05 10:00:11 +01:00
Liang Qi
2c27ccd1c9 Merge remote-tracking branch 'origin/5.7' into 5.8.0
Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
2016-12-02 09:02:23 +01:00
Oswald Buddenhagen
bf4f3a434a Adjust submodule branches
Change-Id: I154feb1976da9853cb4de7e70a4962ad0a6b4067
2016-11-21 12:48:41 +01:00
Liang Qi
acd40269d3 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
2016-11-17 11:41:55 +01:00
Frederik Gladhorn
fbd782636b Clean up usage of qtsvg as dependency
There is no build dependency on QtSvg in qtdeclarative or qtquick1, so
don't recommend it for builds. QtSensors on the other hand has an
example that does need svg.
This does not change anything in the big picture, the svg module will be
built as always and svg files will be displayed. The change is the
ordering of builds (leave more room for parallelization).

Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-11-02 21:09:02 +00:00
Liang Qi
0e4688d36e Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
	.gitmodules

Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
2016-09-30 16:13:52 +02:00
Liang Qi
a5b6125466 Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
2016-09-30 09:27:59 +02:00
Simon Hausmann
6fabd34960 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
2016-09-28 16:41:56 +02:00
Eskil Abrahamsen Blomfeldt
25b385764e Add Qt Android Extras as dependency for Qt Purchasing
Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-09-13 10:28:43 +00:00
Simon Hausmann
31d8277404 Remove qtsystems from the list of recommended modules in qtlocation
QtSystems is not a supported module at the moment, and the code in
QtLocation to utilize QtSystems is behind an #ifdef and destined for
removal.

Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2016-08-28 17:43:26 +00:00
Jani Heikkinen
56fc6bc77b Removed TP status from qtscxml and qtserialbus
Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-24 18:02:44 +00:00
Oswald Buddenhagen
71524c78f6 Merge remote-tracking branch 'origin/dev' into 5.8
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.

Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
2016-08-24 19:54:10 +02:00
Jesus Fernandez
b78f3579af Add qtnetworkauth
Change-Id: I4cd81725d0aec29ff3252a84504a81a44d1b60eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-08-22 09:03:20 +00:00
Oswald Buddenhagen
6cfd3a2118 fix branches of qtpim and qtsystems
these repos were definitely _not_ branched for 5.7.

Change-Id: Ib31d4e07f2651cfba0a7d31a9db1f1a812061313
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-18 04:29:08 +00:00
Frederik Gladhorn
80ee813a03 Make QtSpeech a tech preview release for Qt 5.8
Change-Id: I144109a45bece4b2283c24ad7aae64c098f86963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2016-08-17 08:37:40 +00:00
Oswald Buddenhagen
7efeb26af7 Adjust submodule branches
Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
2016-08-08 11:06:22 +02:00
Liang Qi
39a03d3d6a Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
2016-06-24 07:10:02 +02:00
Liang Qi
e568a942ec Merge remote-tracking branch 'origin/5.7.0' into 5.7
Conflicts:
	.gitmodules

Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
2016-06-10 12:32:03 +02: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
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
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
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
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
Iikka Eklund
84a1676ed6 Update .gitmodules for automated release src package creation
Introduce new "deprecated" value for status attribute.

We have two flavors of big source packages we need to produce:

qt-everywhere-* which needs to include:

 - essential
 - addon
 - preview
 - deprecated (e.g. qtscript and qtenginio for Qt5.6 release)

Installer only specific source package:

 - essential
 - addon

 The rest (deprecated, preview, ...) need to be shown as split src
 packages in the installer.

The above leads to the following changes:

qtscript: addon -> deprecated

 Needs to be part of big src packages but excluded from installer
 specific big source package.

qtenginio: obsolete -> deprecated

 We can't exclude this module from qt-everywhere src packages.

qtwayland: preview -> addon

 Needs to be part of installer specific big src package and the
 module status is not preview anymore.

Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-08 17:54:29 +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
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
81523d838c Adjust submodule branches
Change-Id: I3484da8952951d818e9f584bf9b57e9bb9b1e430
2016-02-12 17:40:00 +01: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
Oswald Buddenhagen
3cfe8712ae fix branches of some modules
all repos which are released (whichever way) need release branches.
and vice versa.
also, it needs to be the *right* release branch.

Task-number: QTBUG-50695
Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-07 09:10:14 +00:00