aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | | Adjust submodule branchesKari Oikarinen2019-08-271-42/+42
| | |/ | |/| | | | | | | Change-Id: Id5eb73617e7c5783724910b58df6c991615a5caa
* | | Add qt5compat to submodules list in devSona Kurazyan2020-02-041-0/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-81630 Change-Id: I85f3d4a5ddbef28c217903816568e0420902f694 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Add qtshadertools as a submodule in devLaszlo Agocs2020-01-311-1/+7
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-78589 Change-Id: I64da5b9f46ace924e3dd24a1ea062379450f8ca3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Re-add qtimageformatsSimon Hausmann2020-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Reduce the set of modules for Qt6 developmentSimon Hausmann2020-01-291-27/+27
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* / Add QtQuick3D as a submodule in qt5.gitChristian Strømme2019-08-261-0/+6
|/ | | | | | | | Adds QtQuick3D as a preview module in dev Task-number: QTBUG-77724 Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Un-ignore qtwebengine in devMichael Brüning2019-07-121-1/+1
| | | | | | Change-Id: I72da39c8bfba31fc366b2757f759a4aba070e960 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update submodules on 'dev' in qt5Liang Qi2019-06-241-1/+1
| | | | | | | | | Skip qttools in this round. Temporarily ignore qtwebengine due to QTBUG-76549. Change-Id: I93afa1bedb18392a3f6c7ae676690b87f07aeaf9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Add qtquicktimeline as a submodule in qt5.git#devThomas Hartmann2019-06-181-0/+6
| | | | | | | | Task-number: QDS-54 Change-Id: Ic92eb39b8bd9fced3b4a701f4d40364a2d8f9e95 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bring qt3d backLiang Qi2019-05-131-1/+1
| | | | | | Task-number: QTBUG-75384 Change-Id: Ia7cf50e3567bf01cce9dcc167253d76cdd963d4d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2019-05-091-1/+1
| | | | | | | | Temporarily ignore qt3d until it got fixed correctly. Task-number: QTBUG-75384 Change-Id: Ib9aec0681b9ca1660f47216e0057600ba4736ce8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-04-141-1/+1
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
| * Deprecate QtXmlPattern moduleAlex Blasche2019-04-081-1/+1
| | | | | | | | | | Change-Id: Iec4561cd6ae38b8133d4f0ddaf5ed0ecb03d4304 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Adjust submodule branchesPaul Wicking2019-01-281-40/+40
|/
* Add qtlottie as a submodule in qt5.git#devJani Heikkinen2019-01-251-0/+6
| | | | | | | 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>
* Remove Qt Canvas3D from qt5.git (Qt 5.13 ->)Jani Heikkinen2019-01-211-1/+1
| | | | | | | Task-number: QTBUG-73015 Change-Id: I52b8d26a2e50b51229c83b532c7a1d5360dc88d7 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-021-3/+3
|\ | | | | | | | | | | | | | | | | | | 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
| * Merge remote-tracking branch 'origin/5.12.0' into 5.12Liang Qi2018-12-221-3/+3
| |\ | | | | | | | | | Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
| | * Add 'qttools' dependency for WebEngineMichal Klocek2018-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Graduate qtremoteobjects and qtwebglpluginLiang Qi2018-11-021-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I07a55764a4a6900d233d4bcfa20344009a9add26 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Adjust submodule branchesOswald Buddenhagen2018-10-221-40/+40
| |/ | | | | | | Change-Id: I43f7c5c76e0cd646e506e7071e9e8c450bdc1b03
* | Ensure qtserialport is treated as optional dependency for qtserialbusAlex Blasche2018-12-121-1/+2
| | | | | | | | | | | | | | Fixes: QTBUG-70360 Change-Id: If4e28c60906787054a607d72a33321eab20a9401 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-10-201-2/+2
|\| | | | | | | Change-Id: I34a18e1ea9ca774638ffe65d08d1fee46efba4aa
| * Make quickcontrols1/2 and webchannel optional for webengineMichal Klocek2018-10-161-2/+2
| | | | | | | | | | | | Fixes: QTBUG-70784 Change-Id: I845216123f7638afd69b39d5da8020a449ab40b8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-08-311-1/+2
|\| | | | | | | Change-Id: I6c3472a0a6c7f1da8e7320cab5cc9b098bd574ba
| * Make xmlpatterns depend on declarativeFrederik Gladhorn2018-08-291-1/+2
| | | | | | | | | | | | | | | | | | 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>
| * Adjust submodule branchesOswald Buddenhagen2018-08-141-40/+40
|/ | | | Change-Id: Ia24ec2ff93495eed938c5dddab83934327ced02e
* Add soft qtdoc => qtquickcontrols 1/2 dependencySimon Hausmann2018-08-081-1/+1
| | | | | | | | | | | 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>
* add soft dep qtdoc => qtmultimediaOswald Buddenhagen2018-08-081-0/+1
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-08-061-7/+0
|\ | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
| * Remove broken qtquick1 submoduleFredrik Orderud2018-08-021-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix dependencies of the qtdoc moduleSimon Hausmann2018-07-311-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | Remove qtenginioSimon Hausmann2018-04-131-6/+0
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-04-101-2/+2
|\| | | | | | | Change-Id: I63778fc883354b724fcf91d92ee6d80b7cb481aa
| * Don't require Qt Android Extras for Qt PurchasingEskil Abrahamsen Blomfeldt2018-04-051-2/+2
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.11' into devOswald Buddenhagen2018-02-071-6/+0
|\| | | | | | | Change-Id: Ia8d3b57d6cb1b89de7164d7ecede664cf5bd2f58
| * Remove QtOpcUA from qt5.gitAlex Blasche2018-02-071-6/+0
| | | | | | | | | | | | This module is moved to tqtc-qt5. Change-Id: I57641392be0a968dfd51633fcba15e38de45abcd
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 23:37:43 +0000