Commit Graph

255 Commits

Author SHA1 Message Date
Tomi Korpipaa c41db7da6c Deprecate qtcharts module in the superproject
Task-number: QTBUG-133659
Change-Id: Icb5e274e88723d9a2d7903998c1cd13248168ae9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2025-02-20 07:53:46 +02:00
Tomi Korpipaa 4b4ba9ca7b Deprecate qtdatavis3d module in the superproject
Task-number: QTBUG-133658
Change-Id: I479ea712880f936d236f779a29f44265d025fca6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2025-02-13 15:13:22 +02:00
Even Oscar Andersen 153ac6480b Add qtwebsockets as dependency for qtmqtt
I add qtwebsockets as dependency because that allows us to use
it for webassembly (in a later change).

Task-number: QTBUG-129171
Change-Id: I8fa1604488e5351b7a5628361137be0e35051c47
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2024-11-03 11:42:09 +01:00
Jani Heikkinen a6529838ce Remove preview status from qtgraphs
Qt Graphs will be officially supported from Qt 6.8.0 ->

Task-number: QTBUG-125143
Pick-to: 6.8
Change-Id: I3dd57696188ef03b1ea67d15fce407fc48d333ec
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2024-08-16 12:05:23 +00:00
Jani Heikkinen 9a59f1d50f Remove preview status from qthttpserver
Qt HTTP Server will be officially supported from Qt 6.8.0 ->

Task-number: QTBUG-125155
Pick-to: 6.8
Change-Id: I3286b2b0bdfcb675774d67909d485e88d100c09d
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2024-08-16 12:05:23 +00:00
Jani Heikkinen 5f0b5bfdcb Remove preview status from qtgrpc
It will be officially supported from Qt 6.8.0 ->

Task-number: QTBUG-125156
Pick-to: 6.8
Change-Id: Idd5d2851dfa9d4c04643b3385ee8b4da86226772
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2024-08-16 12:05:23 +00:00
Mike Krus ed96381b5f Mark Qt3D as deprecated
As per tQtC request

Change-Id: I6de2d99305437c45460417ba82f5ac4d259dbc88
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-05-22 07:06:06 +02:00
Kai Köhne 938e4c74ea Make qtmultimedia a hard dependency for qtspeech
Since commit 1764bc86cdfc22154a (qtspeech.git), Qt Multimedia is a
dependency for all of qtspeech. So let's also mark this as required
for top-level builds.

Change-Id: Iddc47fe7b57afeaf13c0ba36aa1517bf81794f75
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-10-09 14:21:11 +02:00
Simo Fält 86cb676f3c Add qtmultimedia as a recommended dependency for qt3d
Qt CI requires qtmultimedia binaries to create debian packages.

Change-Id: Ib29cefe15db7f32fb9457320d899a4996bda6cba
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 6bedd9ec81)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-30 06:48:52 +00:00
Jani Heikkinen 21f55b70ed Add missing optional dependency for qtgrpc submodule
qtgrpc recommends qtdeclarative; add that one in .gitmodules as well;
the dependency were added in the module in
681d104f0d03f97681536d3691d170d7c06aab2b

Pick-to: 6.6 6.5
Change-Id: I325abc8453d26cf0d75425e806e3e0e7b182070a
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-06-14 07:19:46 +00:00
Jani Heikkinen 912aa2eb46 Add qtgraphs submodule in qt5.git as preview module
Task-number: QTBUG-112800
Change-Id: I39384c20cdb2a83c70ea84628fa37472a62bbaf4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-04-19 05:22:20 +00:00
Shawn Rutledge 6ed6f5f220 Add shadertools and webengine to qtdoc "recommends" list
The photosurface demo uses a custom shader and the PDF image plugin.
The document viewer also needs QtPDF.

Pick-to: 6.5
Task-number: QTBUG-108924
Change-Id: I1236e6b679dc512874299747921407384ce29a67
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-03-22 17:23:47 +00:00
Jani Heikkinen 172ca715e6 Qt6: Remove 'TP' status from qtquick3dphysics from Qt 6.5 ->
qtquick3dphysics will be officially supported module form Qt 6.5 ->
so change the status in .gitmodules from preview to addon

Task-number: QTBUG-107387
Pick-to: 6.5
Change-Id: Ic117f4cf3e99e4a2f59bd84aa14979419a3533b9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-12-16 22:53:49 +00:00
Jani Heikkinen 0a49fc9d7d Add qtquickeffectmaker submodule
Task-number: QTBUG-108164
Change-Id: Ie3887bc420a0451e40a64afc14273ed40790c99f
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2022-11-24 18:58:44 +02:00
Jani Heikkinen d4cc1708ba Change qtlocation from 'ignore' to preview
Task-number: QTBUG-108726
Change-Id: I13ff5af38c846358a9091ce4e0ca3100b4054b39
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-11-24 09:14:18 +02:00
Jani Heikkinen b3b41c2ef7 Add qtgrpc submodule
Task-number: QTBUG-107916
Change-Id: I41d6436b92941efa614fa6b6d5ed31a7c3bc7e5a
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-18 05:28:39 +00:00
Paul Olav Tvete 64a715e8be Make qtmultimedia depend optionally on qtquick3d
Needed for spatialaudioquick3d.

Pick-to: 6.4
Change-Id: I2bbfe1a23622deb90e7641b322ad9eac3ae4a112
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2022-10-21 06:36:24 +02:00
Jani Heikkinen b1a7f2e737 Add qtquick3dphysics submodule
Task-number: QTBUG-103176
Change-Id: Id84b70e33a65d45734e9725628f5d5edfeef6bb6
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-05-25 08:16:26 +03:00
Ievgenii Meshcheriakov c3b063a6f2 Add qthttpserver module as preview
The module provides API for implementing a lightweight HTTP server
in Qt programs.

Task-number: QTBUG-100994
Change-Id: Ic382db6706c61581e70936f97b34eb318b95584a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
2022-05-04 10:34:29 +02:00
Volker Hilsheimer 314d2c5c27 Enable the qtspeech submodule as an add-on
Change-Id: Ie20dfb89f4e90913ae0d5f6230659d22c9fd08c0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-04-22 17:14:38 +02:00
Jani Heikkinen 56dd3e2127 Add qtlanguageserver as a optional dependency for qtdeclarative
Fixes: QTBUG-99737
Change-Id: I9dd71496b6ea974003158ffdd3e651beed60c31d
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 2d329b06e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-28 05:37:06 +00:00
Ulf Hermann ac1cd90010 Add qtlanguageserver
Change-Id: Ib920288cab4a5a8a73d3aafdf1759ad63e3d639c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-12-13 03:51:11 +01:00
Ivan Solovev 70a8080f54 Update qtlocation dependencies
This commit amends 6af22246cf.
qtlocation now depends on qtpositioning, but does not require
qtserialport anymore.

Pick-to: 6.2
Change-Id: I1bda34020f7bc3683cf5038f2e1226d5209dfcc4
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-11-01 10:12:19 +02:00
Ivan Solovev 6af22246cf Add qtpositioning as a submodule
The new qtpositionig repo is created to split QtLocation and
QtPositioning development.
This patch adds the new repo as a submodule to qt5.git
It also marks the qtlocation module as ignored and removes
it from dependencies, using qtpositioning instead.

Task-number: QTBUG-97188
Pick-to: 6.2
Change-Id: I7adb9fc405119f865cd6b25a6ce9eff40d693b14
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-10-21 11:16:20 +02:00
Joerg Bornemann cec25d2ac6 Remove qtgraphicaleffects from .gitmodules
This repository has been merged into qt5compat.

Pick-to: 6.2
Fixes: QTBUG-95228
Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-08-10 12:37:49 +02:00
Joerg Bornemann 149cc2ebc0 Remove qtquickcontrols from .gitmodules
This repository is not available in Qt6.

Every repository that recommends qtquickcontrols should recommend
qtquickcontrols2 instead.  However, this has been merged into
qtdeclarative, which means that the existent dependencies on
qtdeclarative are sufficient.

Pick-to: 6.2
Change-Id: I30980bbbe9ca495f12dc591a693ebc3a4a6a01bc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-08-10 12:37:46 +02:00
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