aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* Make qtmultimedia a hard dependency for qtspeechKai Köhne2023-10-091-2/+2
| | | | | | | | | 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>
* Add qtmultimedia as a recommended dependency for qt3dSimo Fält2023-06-301-1/+1
| | | | | | | | | Qt CI requires qtmultimedia binaries to create debian packages. Change-Id: Ib29cefe15db7f32fb9457320d899a4996bda6cba Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 6bedd9ec81cd58e887d39dda06f2fa59aae8cc94) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing optional dependency for qtgrpc submoduleJani Heikkinen2023-06-141-0/+1
| | | | | | | | | | 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>
* Add qtgraphs submodule in qt5.git as preview moduleJani Heikkinen2023-04-191-0/+6
| | | | | | Task-number: QTBUG-112800 Change-Id: I39384c20cdb2a83c70ea84628fa37472a62bbaf4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add shadertools and webengine to qtdoc "recommends" listShawn Rutledge2023-03-221-1/+1
| | | | | | | | | | | 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>
* Qt6: Remove 'TP' status from qtquick3dphysics from Qt 6.5 ->Jani Heikkinen2022-12-161-1/+1
| | | | | | | | | | 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>
* Add qtquickeffectmaker submoduleJani Heikkinen2022-11-241-0/+7
| | | | | | Task-number: QTBUG-108164 Change-Id: Ie3887bc420a0451e40a64afc14273ed40790c99f Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
* Change qtlocation from 'ignore' to previewJani Heikkinen2022-11-241-1/+1
| | | | | | Task-number: QTBUG-108726 Change-Id: I13ff5af38c846358a9091ce4e0ca3100b4054b39 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add qtgrpc submoduleJani Heikkinen2022-11-181-1/+6
| | | | | | | | 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>
* Make qtmultimedia depend optionally on qtquick3dPaul Olav Tvete2022-10-211-1/+1
| | | | | | | | Needed for spatialaudioquick3d. Pick-to: 6.4 Change-Id: I2bbfe1a23622deb90e7641b322ad9eac3ae4a112 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Add qtquick3dphysics submoduleJani Heikkinen2022-05-251-0/+7
| | | | | | Task-number: QTBUG-103176 Change-Id: Id84b70e33a65d45734e9725628f5d5edfeef6bb6 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add qthttpserver module as previewIevgenii Meshcheriakov2022-05-041-0/+7
| | | | | | | | | | 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>
* Enable the qtspeech submodule as an add-onVolker Hilsheimer2022-04-221-1/+1
| | | | | Change-Id: Ie20dfb89f4e90913ae0d5f6230659d22c9fd08c0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add qtlanguageserver as a optional dependency for qtdeclarativeJani Heikkinen2022-01-281-1/+1
| | | | | | | | Fixes: QTBUG-99737 Change-Id: I9dd71496b6ea974003158ffdd3e651beed60c31d Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 2d329b06e1dabe113e8adc4ad9005f697e3984d8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add qtlanguageserverUlf Hermann2021-12-131-0/+6
| | | | | Change-Id: Ib920288cab4a5a8a73d3aafdf1759ad63e3d639c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update qtlocation dependenciesIvan Solovev2021-11-011-2/+2
| | | | | | | | | | | | This commit amends 6af22246cf3752f1d098a9e8a19617618edf65a2. 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>
* Add qtpositioning as a submoduleIvan Solovev2021-10-211-1/+8
| | | | | | | | | | | | | 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>
* Remove qtgraphicaleffects from .gitmodulesJoerg Bornemann2021-08-101-6/+0
| | | | | | | | | 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>
* Remove qtquickcontrols from .gitmodulesJoerg Bornemann2021-08-101-10/+3
| | | | | | | | | | | | | | | 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>
* Recommend qtimageformats for qtdeclarativeMitch Curtis2021-08-041-1/+1
| | | | | | | | qtquickcontrols2 uses it. Task-number: QTBUG-95173 Change-Id: I6a721f34545656069e91bde9c69b0af976b07e60 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove qtquickcontrols2 submoduleMitch Curtis2021-08-021-11/+4
| | | | | | | | It's now a part of qtdeclarative. Fixes: QTBUG-95416 Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Remove qtpurchasing submodule from qt5Assam Boudjelthia2021-06-281-7/+0
| | | | | | | | | | | | 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>
* Remove qtandroidextras submoduleAssam Boudjelthia2021-06-281-8/+2
| | | | | | | | | 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>
* Make QtMultimedia depend on shadertools and recommend qtquickcontrols2Lars Knoll2021-06-251-2/+2
| | | | | | | | | 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>
* Fix qtmultimedia statusJani Heikkinen2021-06-241-1/+1
| | | | | | | | | It has to be addon Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit a1ee8408ff020dea1faedd88f3472e6ff9aef657) Reviewed-by: Robert Löhning <robert.loehning@qt.io>
* Quick3D : Add optional dependency to QtQuickTimelineInho Lee2021-06-091-0/+1
| | | | | | | | | 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>
* Remove qtwinextras submodulesTor Arne Vestbø2021-06-071-7/+0
| | | | | | | | 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>
* Restore qtwebview as a addon in qt5.gitJani Heikkinen2021-06-071-1/+1
| | | | | | | | | | 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>
* Restore qtwebengine as a addon in qt5.gitJani Heikkinen2021-05-261-1/+1
| | | | | | | | | 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>
* Restore qtwebchannel as a addon in qt5.gitJani Heikkinen2021-05-181-1/+1
| | | | | | | | | 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>
* Restore qtwebsockets as a addon in qt5.gitJani Heikkinen2021-05-181-1/+1
| | | | | | | | | 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>
* Remove qtmacextras and qtx11extras submodulesTor Arne Vestbø2021-05-111-12/+0
| | | | | | | | | | 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>
* Restore qtremoteobjects as a addon in qt5.gitJani Heikkinen2021-05-071-1/+1
| | | | | | | | | 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>
* Switch qtconnectivity from additional library to addonJani Heikkinen2021-05-061-1/+1
| | | | | | | And at same time bump qtconnectivity sha1 in qt5.git Change-Id: I1a9cfdbc95157715bf7b76870d918add76009e4e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Drop unnecessary qttools dependency from m2m protocolsJani Heikkinen2021-04-221-3/+3
| | | | | Change-Id: I5b8a169e4c96e76bc34806a8befdc83784106413 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Change all (except qtconnectivity) additional libraries to addonsJani Heikkinen2021-04-221-16/+16
| | | | | | | | | | | | | | | | 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 55874781a1d66694e4db988403ae66c35041b179)
* Mark QtSensors as an addonJuha Vuolle2021-04-201-1/+1
| | | | | | | | | 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>
* Revert "Add qttools as additional dependency to additional libraries"Jani Heikkinen2021-04-141-9/+4
| | | | | | | | | This reverts commit 919aa17249c6f86e0183a356b09fe7ebbe987336. 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>
* Add qtshadertools as recommends dep to qtdeclarativeLaszlo Agocs2021-03-121-1/+1
| | | | | Change-Id: Ic0d11b3b1312a8d82f6c3421af51bdea2a692b40 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add QtSerialBus as additional libraryKarsten Heimrich2021-03-091-1/+1
| | | | | | | | | 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>
* Add QtLocation to addon modulesIvan Solovev2021-03-051-2/+2
| | | | | | | | | 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>
* Add QtSerialPort as addon moduleIvan Solovev2021-03-041-1/+1
| | | | | | | | | | 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>
* Add QtConnectivity and QtAndroidExtras to addon modulesAndreas Buhr2021-02-191-2/+2
| | | | | | | | | | 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>
* Add qttools as additional dependency to additional librariesJani Heikkinen2021-02-081-4/+9
| | | | | | | | | 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>
* Add Qt 6.1.0 Additional librariesJani Heikkinen2021-02-071-9/+27
| | | | | | | | | | 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>
* Remove qtdocgalleryJoerg Bornemann2021-01-081-6/+0
| | | | | | | | | | | | | | It's dead, Jim. This revives 1117d4da2caf1989f63ca0a8073a799df80428bc which was reverted in 66ed87fc6792a285430e88d8a9de496a532df8d8 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>
* Add Qt Declarative as requirement for Qt 5 CompatEskil Abrahamsen Blomfeldt2021-01-081-1/+1
| | | | | | | | 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>
* Remove unnecessary add-ons from .gitmodulesJani Heikkinen2020-10-121-3/+3
| | | | | | | | | 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>
* Adjust Qt6.0.0 modulesJani Heikkinen2020-08-131-4/+4
| | | | | | | 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>
* Add Qt3D back to addon list and update submoduleMike Krus2020-06-131-2/+2
| | | | | | | Getting ready for Qt 6 inclusion. Change-Id: I5e823ba5c9c0e42cb9afc3ce32d68fa44322f21a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 15:55:03 +0000