aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* Adjust submodule branchesJani Heikkinen2021-10-131-39/+39
| | | | Change-Id: Ie4c48ac8b3a353ddc2ec0b4434a40d66a2d9861d
* Remove qtgraphicaleffects from .gitmodulesJoerg Bornemann2021-08-161-6/+0
| | | | | | | | | | | | | This repository has been merged into qt5compat. Change the 'recommends' field of qtquickcontrols2 from qtgraphicaleffects to qt5compat. Fixes: QTBUG-95228 Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit cec25d2ac62137b9a869f36cda10db43558c215d) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Recommend qtimageformats for qtdeclarativeMitch Curtis2021-08-131-1/+1
| | | | | | | | | | qtquickcontrols2 uses it. Task-number: QTBUG-95173 Change-Id: I6a721f34545656069e91bde9c69b0af976b07e60 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 204d92c244aade12f2bddd3a7107f0462180c4e3) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove qtquickcontrols2 submoduleMitch Curtis2021-08-131-11/+4
| | | | | | | | | | It's now a part of qtdeclarative. Fixes: QTBUG-95416 Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit ed7a7e75ffc9f9a949d3e3d484a7c69aeed116f5) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove qtquickcontrols from .gitmodulesJoerg Bornemann2021-08-101-10/+3
| | | | | | | | | | | | | This repository is not available in Qt6. Every repository that recommended qtquickcontrols already recommends qtquickcontrols2. 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> (cherry picked from commit 149cc2ebc026b279e7b9a3cbc361a71cf2966c67)
* Remove qtpurchasing submodule from qt5v6.2.0-beta1Assam Boudjelthia2021-07-011-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 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> (cherry picked from commit eb16fe519f21c1c60bcbbadf5a318d0765ded166) Reviewed-by: Assam Boudjelthia <assam.boudjelthia@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 Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit 4131439fb9635cac602a0783abd594e8e7e50f2e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove qtandroidextras submoduleAssam Boudjelthia2021-06-151-8/+2
| | | | | | | | | | Remove qtandroidextras from the submodules list of qt5 since it's not part of Qt 6. Task-number: QTBUG-84382 Pick-to: dev Change-Id: Ib95fa4c759c1135b7e0cde9b54ddd334a2f7d382 Reviewed-by: Simo Fält <simo.falt@qt.io>
* Fix qtmultimedia statusJani Heikkinen2021-06-141-0/+1
| | | | | | | | It has to be addon Pick-to: dev Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Restore qtmultimedia as a addon in qt5.gitJani Heikkinen2021-06-121-1/+0
| | | | | | | | | | According to plan Qt Multimedia will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93129 Pick-to: dev Change-Id: I57363932aa461210cac806fa24cc2fe9b6951391 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update submodules on '6.2' manuallyJani Heikkinen2021-06-111-4/+4
| | | | | | | | Submodule update bot didn't do this because of some reason so try this manually instead Change-Id: Iaaad962fec9e56f0a46ab7934c9172eefd328322 Reviewed-by: Heikki Halmet <heikki.halmet@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. Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 6069cf9a84519f907c83d8d919e8eeca634c337f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adjust submodule branchesJani Heikkinen2021-06-091-40/+40
|
* 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>
* Revert "Revert "CMake: Enable CMake builds for qtqa""Alexandru Croitor2020-06-111-1/+1
| | | | | | | | | | | 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 33e8275ee5bda554ab18dd349219262299bf1e9a. Task-number: QTBUG-84233 Change-Id: I1e4ca39717768303eca8435d175aa562fcd6f0f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qt3d: add shadertools to "recommends" modulesJean-Michaël Celerier2020-06-031-1/+1
| | | | | | | This is needed for Qt3D's RHI support. Change-Id: I416ee986db06479775a4dd4251261ecaac805b73 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove the qtquickcontrols2 dependency on qtgraphicaleffectsTasuku Suzuki2020-05-231-2/+2
| | | | | | | | | | 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>
* Revert "Temporarily ignore qtnetworkauth"Alexandru Croitor2020-05-131-1/+1
| | | | | | | | | | | | The qtnetworkauth test was fixed, so we can re-enable the module. Bump the sha1 to the latest version of qtnetworkauth. This reverts commit a8d3591327c3f5d3c1e349e752b2c43f7037fca9. Task-number: QTBUG-84071 Change-Id: I68c953fa97cf0f28a391b496fb321aefe9d8e7d6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Temporarily ignore qtnetworkauthLiang Qi2020-05-071-1/+1
| | | | | | Task-number: QTBUG-84071 Change-Id: I8486c55dc7062f50e7722b03031750b58be23a1f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-04-301-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-04-241-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Set qtgraphicaleffects essential as qtquickcontrols2 depends on itAndy Shaw2020-02-251-1/+1
| | | | | | | | | | | | | | | Change-Id: I0a157f71ed8d5132b8238691cbb0f4aa57b04976 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Merge remote-tracking branch 'origin/dev' into 5.14Liang Qi2019-08-261-0/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Idd7160b4c1aeb43a2c9580e93627eae118b742a3
| | * | Adjust submodule branchesPaul Wicking2019-08-191-41/+41
| | | |
* | | | Completely remove QtScript from qt5.gitLars Knoll2020-04-011-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-02-281-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Remove 'TP' status from submodulesJani Heikkinen2020-02-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 18:37:23 +0000