Commit Graph

195 Commits

Author SHA1 Message Date
Simon Hausmann
bf87526ff0 Add QtConnectivity
Now that the cmake port landed

Change-Id: I5218a23fffd8de736ffcf5e039d369aec0827f42
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-24 15:49:17 +00:00
Liang Qi
6df365e0b2 Add qtserialbus to qt5
Change-Id: Ie3ad2a734b1f7ba341a93ff7f3cd96fee56c62c6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-09 08:27:00 +00:00
Liang Qi
bd3b4ef170 Add qtgamepad and qtscxml to qt5
Change-Id: I7267704b048aae8cdd634d47c7ae4040272298ea
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-02 15:55:08 +00:00
Liang Qi
44073f5563 Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt

Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
2019-09-23 16:38:06 +02:00
Simon Hausmann
5c1656826b Add qtserialport to qt5
The module has received its initial port

Change-Id: Ie5814be1f52965cb2393ec331e12751472890abc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-09-19 14:42:13 +00:00
Simon Hausmann
afa801cd31 Re-add QtWebSockets
Maurice ported the module and we can add it to the Qt5 set now.

Change-Id: I146e60f6f18dcf7a00775e532e715e3718644edc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-09-16 15:18:13 +00:00
Simon Hausmann
016016b64e Really add qttools to the build
... and not qtscript accidentally, like in the previous change.

Change-Id: Ic8cd85ef7b149ffee7bc85ffa3fc9075f8a77c1b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-06 13:32:03 +00:00
Simon Hausmann
01b083ca8e Disable qtscript for the cmake build
The module has not been ported.

Change-Id: I99041e00fb30b2a9799ee3e948f255422bbc6976
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-09-06 09:23:52 +00:00
Simon Hausmann
f99d5e8b78 Re-enable qttools for use with cmake
Change-Id: I040b8769af22290a986ccac476f30e7eed78b3e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-06 09:04:50 +00:00
Liang Qi
5bd6aa7c26 Include qtimageformats and qtnetworkauth in wip/cmake
Change-Id: I9f451ef08663a635ca05427735a31da895a68607
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-05 11:56:43 +00:00
Liang Qi
30d78feb0c Include qtgraphicaleffects in wip/cmake
Change-Id: Ie8fd5d478caa1d16cdea3c06a9b7cfeeb7dcd0cc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-05 07:45:36 +00:00
Liang Qi
651b050e13 Include qtdeclarative in wip/cmake
Change-Id: I9d23a60fbd88e30ee688532dbe5112dd3245b9a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-04 17:52:10 +00:00
Liang Qi
4bf048f7a7 Include qtsvg in wip/cmake
Change-Id: I6df7b31637e9512dc7fe92819741d01af3f87310
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-08-30 10:40:25 +00:00
Christian Strømme
ff75bd5297 Add QtQuick3D as a submodule in qt5.git
Adds QtQuick3D as a preview module in dev

Task-number: QTBUG-77724
Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2019-08-26 12:43:06 +03:00
Michael Brüning
57ea35cace Un-ignore qtwebengine in dev
Change-Id: I72da39c8bfba31fc366b2757f759a4aba070e960
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2019-07-12 21:48:32 +02:00
Liang Qi
19894d279f Update submodules on 'dev' in qt5
Skip qttools in this round.

Temporarily ignore qtwebengine due to QTBUG-76549.

Change-Id: I93afa1bedb18392a3f6c7ae676690b87f07aeaf9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-24 09:31:56 +02:00
Thomas Hartmann
a0b69977c6 Add qtquicktimeline as a submodule in qt5.git#dev
Task-number: QDS-54
Change-Id: Ic92eb39b8bd9fced3b4a701f4d40364a2d8f9e95
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-18 11:20:22 +02:00
Liang Qi
2e028e620d Bring qt3d back
Task-number: QTBUG-75384
Change-Id: Ia7cf50e3567bf01cce9dcc167253d76cdd963d4d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-13 14:20:06 +00:00
Liang Qi
a66a54035c Update submodules on 'dev' in qt5
Temporarily ignore qt3d until it got fixed correctly.

Task-number: QTBUG-75384
Change-Id: Ib9aec0681b9ca1660f47216e0057600ba4736ce8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-09 12:57:41 +00:00
Liang Qi
ff8220f9f6 Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtbase.txt

Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
2019-05-03 10:10:23 +02:00
Liang Qi
e10a2d4ffe Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
	.gitmodules

Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
2019-04-14 23:11:30 +02:00
Alex Blasche
16201ab31d Deprecate QtXmlPattern module
Change-Id: Iec4561cd6ae38b8133d4f0ddaf5ed0ecb03d4304
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-04-08 06:28:02 +00:00
Simon Hausmann
bc14adc831 Shrink build configurations and modules
This change disables all modules except qtbase from the build and also
reduces the build to one configuration. This is not intended to be
merged back to qt5/dev but rather a starting point to build up cmake
builds in the CI platform by platform and module by module.

Change-Id: I899da885dacb32188a0d02b2301df3d4450c0589
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-03-13 14:26:31 +00:00
Paul Wicking
3793e0ddfc Adjust submodule branches 2019-01-28 14:37:50 +01:00
Jani Heikkinen
77a73f65df Add qtlottie as a submodule in qt5.git#dev
Task-number: QTBUG-72945
Change-Id: Ib8daf1541e7ff5dca70e8a1c7bec48ee02d0eb59
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-01-25 11:06:21 +00:00
Jani Heikkinen
390a373f28 Remove Qt Canvas3D from qt5.git (Qt 5.13 ->)
Task-number: QTBUG-73015
Change-Id: I52b8d26a2e50b51229c83b532c7a1d5360dc88d7
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2019-01-21 08:02:03 +00:00
Liang Qi
38e2fc6b80 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	.gitmodules
	coin/provisioning/common/linux/docker_testserver.sh
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Done-With: Ryan Chu <ryan.chu@qt.io>
Change-Id: I9bc3afcb50783a9f0f7718731d237de4be287cae
2019-01-02 10:46:49 +01:00
Liang Qi
0e82de327b Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
2018-12-22 23:21:54 +01:00
Alex Blasche
57e432e0da Ensure qtserialport is treated as optional dependency for qtserialbus
Fixes: QTBUG-70360
Change-Id: If4e28c60906787054a607d72a33321eab20a9401
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-12 09:01:28 +00:00
Michal Klocek
417d293fa7 Add 'qttools' dependency for WebEngine
QtTools module is required for designer plugin.

Fixes: QTBUG-71404
Change-Id: I081740679dace196b9ff42d98bddd941848738f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-11-05 18:13:19 +00:00
Liang Qi
9a9f358508 Graduate qtremoteobjects and qtwebglplugin
Change-Id: I07a55764a4a6900d233d4bcfa20344009a9add26
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-02 14:56:28 +00:00
Oswald Buddenhagen
ff2c96f483 Adjust submodule branches
Change-Id: I43f7c5c76e0cd646e506e7071e9e8c450bdc1b03
2018-10-22 15:52:09 +02:00
Liang Qi
16c6fa419a Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I34a18e1ea9ca774638ffe65d08d1fee46efba4aa
2018-10-20 14:17:57 +02:00
Michal Klocek
b365b3853e Make quickcontrols1/2 and webchannel optional for webengine
Fixes: QTBUG-70784
Change-Id: I845216123f7638afd69b39d5da8020a449ab40b8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-10-16 13:59:23 +00:00
Liang Qi
5024bd5725 Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6c3472a0a6c7f1da8e7320cab5cc9b098bd574ba
2018-08-31 16:32:13 +02:00
Frederik Gladhorn
e470da9d65 Make xmlpatterns depend on declarative
After moving the xmllistmodel into qtxmlpatterns we can reverse the
dependency. This will improve build times and cleaning up dependencies
makes sense in any case.

Change-Id: I560d51ee47167a0cb519b98a15e6eb9199b4cd79
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-29 05:50:07 +00:00
Oswald Buddenhagen
8b46f403c8 Adjust submodule branches
Change-Id: Ia24ec2ff93495eed938c5dddab83934327ced02e
2018-08-14 13:00:09 +02:00
Simon Hausmann
76d922b211 Add soft qtdoc => qtquickcontrols 1/2 dependency
The photoviewer demo imports QtQuick Controls 1 and the coffee demo
imports Qt Quick Controls 2. This is a run-time dependency for dynamic
builds, but for static builds it becomes a build time dependency.

Change-Id: Ie8d7dcf85c2dfe93033fa9254ee350fb654475c3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-08-08 14:13:28 +00:00
Oswald Buddenhagen
0a65cf0e9c add soft dep qtdoc => qtmultimedia
at least the maroon demo will use the multimedia module if available.

Task-number: QTBUG-69823
Change-Id: I7e0f7103aaf1a33a755b9a362274273a9b997f37
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Alexander Shevchenko <sav_ix@ukr.net>
2018-08-08 10:21:09 +00:00
Liang Qi
d746bc3ea8 Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
2018-08-06 11:31:33 +02:00
Fredrik Orderud
d60ef0b202 Remove broken qtquick1 submodule
This submodule have not been maintained in several years. Building currently
fails due to qtquick1 not being in sync with interface changes in qtbase. I
think it's therefore better to just remove the submodule altogether. That way
we stop causing problems for external developers wanting to build Qt from
source.

Task-number: QTBUG-69725
Change-Id: I905888d99f510be12c484f7da52986c9b1e9478f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-08-02 19:33:13 +00:00
Simon Hausmann
21995a6158 Fix dependencies of the qtdoc module
After commit 01d2f35b6988edacc741b358703d16d4cd8c199a in qtbase, the
existing CONFIG+=lrelease in examples/demos/photoviewer/photoviewer.pro
now calls lrelease and thus requires qttools.

Change-Id: I7cabc70fc6316a49793d7e91a493d8a5e5028295
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-07-31 14:36:44 +00:00
Simon Hausmann
847cbbd869 Remove qtenginio
The module has been dead for a while as well as the corresponding
service.

Change-Id: I40ce39f18d32be7ae22e944dcd181a7d7c0cfce5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-13 10:45:53 +00:00
Liang Qi
9b584a8117 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I63778fc883354b724fcf91d92ee6d80b7cb481aa
2018-04-10 15:04:06 +02:00
Eskil Abrahamsen Blomfeldt
3c23dc4846 Don't require Qt Android Extras for Qt Purchasing
Qt Purchasing is supported on other platforms than Android, so
move qtandroidextras from depends to recommends instead.

Task-number: QTBUG-67318
Change-Id: I9c70574dd9b45579485b2640f7daeebdc6c2bc63
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-05 14:44:48 +00:00
Oswald Buddenhagen
9c506a5164 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia8d3b57d6cb1b89de7164d7ecede664cf5bd2f58
2018-02-07 20:17:09 +01:00
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
J-P Nurmi
13be05c06d Swap qtquickcontrols vs. qtquickcontrols2 statuses
The Qt Quick Controls (1) module, which was still listed as an essential
module, has not been actively developed for almost three years. Promote
Qt Quick Controls 2 as an essential module instead, and demote Qt Quick
Controls (1) as an addon.

Change-Id: If51c6c17d199ca10a574053d7dba67539a764aba
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:17 +00:00
Frederik Gladhorn
b032d87632 Revert "Adjust submodule branches"
This got merged accidentally.

This reverts commit 282899453d.

Change-Id: I1457513217e636aa54b43a1dc21b01443c798119
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:10 +00:00
Oswald Buddenhagen
282899453d Adjust submodule branches
Change-Id: Id6fe05f393152581b8509fd613084df1f318bc54
2018-01-24 17:49:00 +01:00