Commit Graph

229 Commits

Author SHA1 Message Date
Mitch Curtis
204d92c244 Recommend qtimageformats for qtdeclarative
qtquickcontrols2 uses it.

Task-number: QTBUG-95173
Change-Id: I6a721f34545656069e91bde9c69b0af976b07e60
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-04 09:41:47 +02:00
Mitch Curtis
ed7a7e75ff Remove qtquickcontrols2 submodule
It's now a part of qtdeclarative.

Fixes: QTBUG-95416
Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-08-02 10:06:04 +02:00
Assam Boudjelthia
eb16fe519f Remove qtpurchasing submodule from qt5
Qt purchasing was not part of Qt 6, and will be moved as a demo/example
under qtdoc, thus we don't need it here.

Task-number: QTBUG-84776
Pick-to: 6.2
Change-Id: Ie6f704e72914072e7e105763ffaeae1d13cff086
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2021-06-28 13:29:13 +00:00
Assam Boudjelthia
912fdda4a4 Remove qtandroidextras submodule
Remove qtandroidextras from the submodules list of qt5 since it's
not part of Qt 6.

Task-number: QTBUG-84382
Change-Id: I2f9b5a576781b5d45e563dfda7830c17996685a5
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-06-28 08:11:43 +00:00
Lars Knoll
4131439fb9 Make QtMultimedia depend on shadertools and recommend qtquickcontrols2
Multimedia needs shadertools for building, so make that explicit.
Some examples use Qt Quick Controls, so we recommend that as well

Pick-to: 6.2
Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-06-25 13:16:21 +00:00
Jani Heikkinen
a341894f29 Fix qtmultimedia status
It has to be addon

Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a1ee8408ff)
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-06-24 11:10:20 +02:00
Inho Lee
6069cf9a84 Quick3D : Add optional dependency to QtQuickTimeline
Quick3D's runtime asset animation needs QuickTimeline module.
This is an optional module just for the animation feature.

Pick-to: 6.2
Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
2021-06-09 09:32:47 +00:00
Tor Arne Vestbø
f5dbd9b4f0 Remove qtwinextras submodules
It's no longer part of Qt (as of Qt 6)

Task-number: QTBUG-89564
Change-Id: I302c58f1b6a55797cf1f6722eafe936561bf456f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2021-06-07 11:17:58 +02:00
Jani Heikkinen
d71ae6f832 Restore qtwebview as a addon in qt5.git
According to plan Qt Webview will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93222
Change-Id: I20a20e74f08327a15d6c3985a42efc01b01a5848
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2021-06-07 10:22:27 +03:00
Jani Heikkinen
7cda9fd97b Restore qtwebengine as a addon in qt5.git
According to plan Qt Webengine will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93195
Change-Id: If7e0406bb66033e110f16518a73a2579721cb0c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-26 12:54:40 +03:00
Jani Heikkinen
66ce587c46 Restore qtwebchannel as a addon in qt5.git
According to plan Qt Webchannel will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93212
Change-Id: Iea137a18d8c635210ee56e2ebfa1f485b4a791a8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-18 17:18:41 +03:00
Jani Heikkinen
82f2b64659 Restore qtwebsockets as a addon in qt5.git
According to plan Qt Web Sockets will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93684
Change-Id: Idbbc0e5c553bcd863f4b8ad21b9aee6057fe139e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-18 10:13:38 +03:00
Tor Arne Vestbø
d85ff1e934 Remove qtmacextras and qtx11extras submodules
They are no longer part of Qt (as of Qt 6), and the modules themselves
have been wiped (9d99db029613d9cd847407085c5de7f310cd0937, and
6037ece5e4c0d290ae4ebf75c0d9bce0de55ed85).

Task-number: QTBUG-83251
Change-Id: Ie3acfc6d31bda0fcc1c6189e08171dbdf3c50ff7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2021-05-11 10:04:16 +02:00
Jani Heikkinen
da632b95d2 Restore qtremoteobjects as a addon in qt5.git
According to plan Qt Remote Objects will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93139
Change-Id: Ia4c9feae94b69f01a3c36872b346aa872f0e6654
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2021-05-07 10:33:55 +03:00
Jani Heikkinen
3916c0bbac Switch qtconnectivity from additional library to addon
And at same time bump qtconnectivity sha1 in qt5.git

Change-Id: I1a9cfdbc95157715bf7b76870d918add76009e4e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-05-06 13:50:28 +03:00
Jani Heikkinen
e574441847 Drop unnecessary qttools dependency from m2m protocols
Change-Id: I5b8a169e4c96e76bc34806a8befdc83784106413
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2021-04-22 11:39:14 +03:00
Jani Heikkinen
a8a17646ab Change all (except qtconnectivity) additional libraries to addons
It has been decided to *not* ship source-only Conan packages in Qt 6.1,
but revert back to delivering the additional libraries similarly as with
Qt 5.

That's why we need to switch all additional libraries to addon to start
building binaries for those as well in qt5.git integration.

qtconnectivity will be changed when QTBUG-92990 is fixed.

Task-number: QTBUG-91796
Change-Id: Ia154b62d5c1a997575d844aaf21f399a24626748
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
(cherry picked from commit 55874781a1)
2021-04-22 11:39:14 +03:00
Juha Vuolle
76e9d4bfbb Mark QtSensors as an addon
The QtSensors is headed to Qt 6.2 and initial cmake port has been merged

Task-number: QTBUG-92502
Change-Id: I9ff7062677040fd35d285373cca19515a0cb921f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-20 17:25:43 +03:00
Jani Heikkinen
bba6c1bd70 Revert "Add qttools as additional dependency to additional libraries"
This reverts commit 919aa17249.

Reason for revert: additional libraries will be part of qt5.git build -> we don't need to have qttools as dependency there anymore

Change-Id: If77278c030be961d2282ff5c049d5ec6b03a578b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-04-14 09:19:30 +00:00
Laszlo Agocs
7ac5d86de5 Add qtshadertools as recommends dep to qtdeclarative
Change-Id: Ic0d11b3b1312a8d82f6c3421af51bdea2a692b40
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2021-03-12 17:40:11 +01:00
Karsten Heimrich
baaca594ca Add QtSerialBus as additional library
This patch adds QtSerialBus to be updated by submodule udpate bot.

Change-Id: I9b51118d21ee4309315d36cab5bf9721b34067f7
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-03-09 09:16:10 +01:00
Ivan Solovev
66e8759c66 Add QtLocation to addon modules
This patch adds QtLocation to be updated by submodule update bot.
Also removes unused dependencies.

Task-number: QTBUG-90864
Change-Id: Ia54234ad26907129932d76be11a3402cd8bddec9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-03-05 18:16:04 +01:00
Ivan Solovev
c8981696df Add QtSerialPort as addon module
This patch adds QtSerialPort to be updated by submodule udpate bot

Task-number: QTBUG-90864
Change-Id: Ic029157a7b6e88f8c8899f9f5b075943d2767810
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2021-03-04 09:46:01 +01:00
Andreas Buhr
f730c5b88d Add QtConnectivity and QtAndroidExtras to addon modules
To have QtAndroidExtras and QtConnectivity updated by
submodule update bot, this patch marks both of them as
addon instead of ignore.

Change-Id: Ibf34848978ef1f39273f71c99c6b1f7e18bf2fe6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-02-19 13:40:51 +01:00
Jani Heikkinen
919aa17249 Add qttools as additional dependency to additional libraries
qttools is needed to be able to build documentation

Pick-to: 6.1
Fixes: QTBUG-90996
Change-Id: I27f101dc4294f830b9915e1530d660cfe12aeabe
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-02-08 09:08:32 +02:00
Jani Heikkinen
dba2b570b9 Add Qt 6.1.0 Additional libraries
Set status to additionalLibrary to ones already in .gitmodules as ignore status
Add missing ones with status = additionalLibrary

Task-number: QTBUG-90669
Pick-to: 6.1
Change-Id: I5f7518c516d10ae68fb5cf20851b36bde4fbc0b2
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-02-07 12:14:27 +02:00
Joerg Bornemann
2ade76fecd Remove qtdocgallery
It's dead, Jim.

This revives 1117d4da2c which was reverted
in 66ed87fc67 to make a resurrection
easier. However, there was no revival attempt for many years now, and
it's unlikely that this is going to change.

Pick-to: 6.0 5.15
Task-number: QTBUG-89664
Change-Id: I55134f407ec870ab25824e352ac77bff28a5f0f0
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-01-08 11:54:51 +01:00
Eskil Abrahamsen Blomfeldt
9be91e74a4 Add Qt Declarative as requirement for Qt 5 Compat
Since Qt 5 Compat now also includes Qt Graphical Effects,
it depends on this repository.

Change-Id: I5f55958d774e17434946470fd7dc65bb305805c3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-01-08 08:47:55 +01:00
Jani Heikkinen
a892a2ca19 Remove unnecessary add-ons from .gitmodules
qt3d, qtimageformats and qtnetworkaut will be delivered via package
manager so those shouldn't be in qt5.git integrations from Qt 6.0 ->

Task-number: QTBUG-87255
Change-Id: I2ddaf561123153b78b4bd972c22a90ba1309a91d
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2020-10-12 19:28:10 +03:00
Jani Heikkinen
202e189233 Adjust Qt6.0.0 modules
Statuses etc are based on https://wiki.qt.io/Checklist_for_Qt_6.0_inclusion

Change-Id: If59d26cd2e9f381bef81308292675c5300672c25
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-08-13 15:53:01 +00:00
Mike Krus
df53ff5f85 Add Qt3D back to addon list and update submodule
Getting ready for Qt 6 inclusion.

Change-Id: I5e823ba5c9c0e42cb9afc3ce32d68fa44322f21a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-13 20:41:58 +01:00
Alexandru Croitor
947802bea3 Revert "Revert "CMake: Enable CMake builds for qtqa""
There's a new dev branch for qtqa, so we can re-enable CMake builds
of qtqa using that branch, without breaking builds of other branches.

This reverts commit 33e8275ee5.

Task-number: QTBUG-84233
Change-Id: I1e4ca39717768303eca8435d175aa562fcd6f0f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-06-11 12:08:06 +02:00
Jean-Michaël Celerier
3f95e2b019 qt3d: add shadertools to "recommends" modules
This is needed for Qt3D's RHI support.

Change-Id: I416ee986db06479775a4dd4251261ecaac805b73
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-03 07:22:22 +00:00
Tasuku Suzuki
598f82300a Remove the qtquickcontrols2 dependency on qtgraphicaleffects
The Material style uses its own shader effects, and
recent patches did the same for the Imagine style.
There were some auto tests that have been made to only
run if qtgraphicaleffects is available.

Change-Id: Ifcfcad9591d2a0a8d5ebed505566cd0103dd9176
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-05-23 00:47:42 +00:00
Alexandru Croitor
3384823666 Revert "Temporarily ignore qtnetworkauth"
The qtnetworkauth test was fixed, so we can re-enable the module.

Bump the sha1 to the latest version of qtnetworkauth.

This reverts commit a8d3591327.

Task-number: QTBUG-84071
Change-Id: I68c953fa97cf0f28a391b496fb321aefe9d8e7d6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-05-13 11:47:37 +02:00
Liang Qi
a8d3591327 Temporarily ignore qtnetworkauth
Task-number: QTBUG-84071
Change-Id: I8486c55dc7062f50e7722b03031750b58be23a1f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-07 21:52:26 +02:00
Liang Qi
54c94ae681 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtwebkit.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
2020-04-30 18:35:08 +02:00
Liang Qi
cc4fdea014 Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsdk.yaml
	coin/platform_configs/tqtc-qt-rta.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
2020-04-24 15:31:01 +02:00
Lars Knoll
a3e33df7f6 Completely remove QtScript from qt5.git
It doesn't even compile against c++17 anymore (uses auto_ptr),
and the JavaScript engine is now more than 10 years outdated.

Change-Id: I56cc36aa5aeb4dfa6b19b699886f6e34fe1eecbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-01 22:36:01 +02:00
Liang Qi
08e63423e2 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/flashing-wizard.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/tqtc-qt-config-gui.yaml
	coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0
2020-02-28 13:49:10 +01:00
Andy Shaw
8a4f808649 Set qtgraphicaleffects essential as qtquickcontrols2 depends on it
Change-Id: I0a157f71ed8d5132b8238691cbb0f4aa57b04976
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-02-25 13:09:06 +00:00
Jani Heikkinen
bb39b8730a Remove 'TP' status from submodules
From Qt 5.15 ->
   - QtQuick3D will be officially supported
   - QtLottie will be officially supported
   - QtQuickTimeline will be officially supported

Task-number: QTBUG-81818
Task-number: QTBUG-81834
Task-number: QTBUG-81922
Change-Id: I5e6efd5ccaf0bb25c83c9b88cc6cc2f8146993e2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-13 13:26:46 +02:00
Sona Kurazyan
601c1bd79b Add qt5compat to submodules list in dev
Task-number: QTBUG-81630
Change-Id: I85f3d4a5ddbef28c217903816568e0420902f694
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2020-02-04 20:01:02 +01:00
Laszlo Agocs
5b56192bc1 Add qtshadertools as a submodule in dev
Task-number: QTBUG-78589
Change-Id: I64da5b9f46ace924e3dd24a1ea062379450f8ca3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Simon Hausmann
3c6f8b1af5 Re-add qtimageformats
Qt Quick Controls 2 styles use webp, which in turn is instantiated by
tests.

Change-Id: I7a9a98f96beecb1f214e9e2caef0062a5716d31e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-30 09:26:13 +01:00
Simon Hausmann
24d977a188 Reduce the set of modules for Qt6 development
Change the amount of modules that are tested together by the CI (and
then used for initial Qt 6 snapshots) to the core essential modules. All
others are set to "ignore" and the objective is to bring them back later
when qtbase/declarative/quick3d development has settled.

Notable exceptions are svg and graphicaleffects due to their strong
dependency from qtvirtualkeyboard as well as qtquickcontrols2.

Change-Id: I972d7b353add1f5dbad5104ce84c4cc5b8c6f616
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-01-29 10:39:01 +01:00
Kari Oikarinen
97afb2ce08 Adjust submodule branches
Change-Id: Id5eb73617e7c5783724910b58df6c991615a5caa
2019-08-27 09:31:36 +03:00
Liang Qi
6f3f8913d8 Merge remote-tracking branch 'origin/dev' into 5.14
Conflicts:
	.gitmodules

Change-Id: Idd7160b4c1aeb43a2c9580e93627eae118b742a3
2019-08-26 18:31:59 +02: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
Paul Wicking
2e9314967c Adjust submodule branches 2019-08-19 15:11:54 +02:00