Commit Graph

147 Commits

Author SHA1 Message Date
Alex Blasche
d212f48b67 Remove QtOpcUA from qt5.git
This module is moved to tqtc-qt5.

Change-Id: I57641392be0a968dfd51633fcba15e38de45abcd
2018-02-07 11:32:54 +01:00
Oswald Buddenhagen
282899453d Adjust submodule branches
Change-Id: Id6fe05f393152581b8509fd613084df1f318bc54
2018-01-24 17:49:00 +01:00
Liang Qi
d196866f31 Revert "Temporarily ignore qtwayland"
QtWayland adapted to new api in qtbase.

This reverts commit eba433c126.

Task-number: QTBUG-65600
Change-Id: If46f054adfb8a2db0d82acbd07cb39b2f512530e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-01-07 15:50:41 +00:00
Liang Qi
eba433c126 Temporarily ignore qtwayland
qtbase changed API, qssize_t was changed to qsizetype. In order for
qtwayland to update, qt5 needs to update first; but in order for
qt5 to update, qtwayland needs to compile.

Ignoring breaks cycle.

Task-number: QTBUG-65600
Change-Id: I978b0ed8dc86898ab1feb8b9cc47960e42095dfa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 13:30:20 +00:00
Liang Qi
ba6ae3be9a Revert "Temporarily ignore qtcanvas3d"
QtCanvas3D adapted to new internal api in qtdeclarative.

This reverts commit 146bda6468.

Task-number: QTBUG-64766
Change-Id: I709cb8856b674edc1a7d3217fdf68cbe8aca1608
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:41 +00:00
Liang Qi
146bda6468 Temporarily ignore qtcanvas3d
qtdeclarative changed internal API.

Task-number: QTBUG-64766
Change-Id: I7a0bbcaf121bf852fc028be275e82a5658c132a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:39:02 +00:00
Liang Qi
def11da274 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
2017-12-14 11:49:07 +01:00
Jesus Fernandez
4a4589d878 Don't recommend QtWebView in QtNetworkAuth module
QtWebView is not used in QtNetworkAuth. There is no need to recommend
the QtWebView module.

Change-Id: I2dbb9d4024ada9436725f4dac643574b558fb9ae
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-03 11:08:25 +00:00
Liang Qi
1099b1ddce Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt

Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
2017-10-05 12:47:24 +02:00
Alex Blasche
92b8f50bfa Introduce qtopcua to top-level Qt builds
Change-Id: Iaf9e137c0ae08cc527e14a394cfaf235dfce13fe
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-05 07:09:06 +00:00
J-P Nurmi
eb6ce241f0 qtquickcontrols2: recommend qtimageformats
The new image-based style in Qt Quick Controls 2 uses WebP for
animations.

Change-Id: I42360fc29fbfdc1d85cab5ef37b57569e5af6901
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-08-31 14:29:01 +00:00
Oswald Buddenhagen
738509c242 Adjust submodule branches
Change-Id: I24415b4ce9d74e9eb83420a55e9036d1b0785a73
2017-08-25 14:59:40 +02:00
Liang Qi
ebf8aa15e6 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
	coin/provisioning/common/system_updates.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
2017-08-24 09:12:33 +02:00
Simon Hausmann
5a0dc401fa Remove QtWebKit and QtWebKit examples from Qt 5
They are subject to a separate release.

Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-08-15 19:01:35 +00:00
Harald Vistnes
830f8ac7f2 Make Qt3D depend on qtbase and optionally on qtdeclarative
This change will make the pure C++ libs of Qt3D be built even if
qtdeclarative is skipped.

Task-number: QTBUG-62256
Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-08-02 05:30:16 +00:00
Simon Hausmann
d615b4a99f Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
		Remove QNX Windows builds, 0358b6d2
		Remove Integrity build temporarily, QTBUG-61702
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
2017-07-14 07:24:32 +00:00
Jani Heikkinen
f3a2e06e60 Switch qtspeech & qtnetworkauth from tp to addon
qtspeech and qtnetworkauth aren't technology preview modules anymore
from Qt 5.10 ->

Task-number: QTBUG-61436
Change-Id: I1a88f554498461a81ee80f435fccad7d0e542abf
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-29 21:16:52 +00:00
Jesus Fernandez
e6d42ad390 Add qtwebglplugin
Task-number: QTBUG-61443
Change-Id: I0a139c68c41cfa11d110fab1d7c97276c4d022a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-06-28 15:34:08 +00:00
Thiago Macieira
60fb73a1eb qtremoteobjects has QML plugins
Change-Id: Ia3e896da908f42939148fffd14c47ef303f5d0e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
2017-06-04 17:03:03 +00:00
Liang Qi
1f15ce005f Merge remote-tracking branch 'origin/5.9.0' into 5.9
Conflicts:
	.gitmodules

Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
2017-05-26 10:29:43 +02:00
Liang Qi
41379a50c7 Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
2017-05-08 08:35:30 +02:00
Oswald Buddenhagen
8d2f6c17f9 Merge remote-tracking branch 'origin/5.9' into 5.9.0
Conflicts:
	.gitmodules

Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
2017-05-05 11:22:54 +02:00
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
Oswald Buddenhagen
8325f2bde9 Adjust submodule branches
Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951
2017-04-27 12:34:03 +02:00
Oswald Buddenhagen
2715a17c9b get rid of custom 'qt' gitmodules property
instead, re-use the (also custom) 'project' property with the magic
value '-' to flag modules which contain no project files at all.

Change-Id: I33163c098852e1b79ad698115aac98217efe1157
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-27 04:17:42 +00:00
Liang Qi
415ea08693 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I88192479624510cb34227f401d9e8b07977f9711
2017-04-09 09:40:45 +02: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
Liang Qi
37e3da674c Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
2017-03-28 10:20:15 +02: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
f65308d371 Merge remote-tracking branch 'origin/5.9' into dev
This change also integrated latest dev branch of qtremoteobjects
and qtwebengine.

Conflicts:
	.gitmodules
	qtremoteobjects
        qtwebengine

Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
2017-03-07 19:40:36 +01: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