aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* Correct branches for .gitmodulesLiang Qi2019-11-291-2/+2
| | | | | | | This amends eabc1ed5bd46a7882c5b98a19716e3b9aef694fa. Change-Id: Ifbcf5dc593d25d210b652b72e5563fb8e1a1ec5f Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update qt5.gitLeander Beernaert2019-11-251-1/+1
| | | | | Change-Id: Ie922b8e2989215de4efd3596e6532b201a3e7d0c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add a few more ported repos to qt5.git wip/cmakeAlexandru Croitor2019-11-151-3/+3
| | | | | Change-Id: I9f7215d3df0ba07af337262dd5e43bfc79e0a97a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add x11extras to the qt5 buildSimon Hausmann2019-10-291-2/+2
| | | | | | Change-Id: Iac7273717b7dff510c79cd6151349e6ddb6a5e56 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Add QtConnectivitySimon Hausmann2019-10-241-2/+2
| | | | | | | | Now that the cmake port landed Change-Id: I5218a23fffd8de736ffcf5e039d369aec0827f42 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Add qtserialbus to qt5Liang Qi2019-10-091-2/+2
| | | | | | Change-Id: Ie3ad2a734b1f7ba341a93ff7f3cd96fee56c62c6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CMake Build Bot
* Add qtgamepad and qtscxml to qt5Liang Qi2019-10-021-4/+4
| | | | | | Change-Id: I7267704b048aae8cdd634d47c7ae4040272298ea Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-09-231-0/+12
|\ | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.txt Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
| * 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>
* | Add qtserialport to qt5Simon Hausmann2019-09-191-2/+2
| | | | | | | | | | | | | | | | The module has received its initial port Change-Id: Ie5814be1f52965cb2393ec331e12751472890abc Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Qt CMake Build Bot
* | Re-add QtWebSocketsSimon Hausmann2019-09-161-2/+2
| | | | | | | | | | | | | | Maurice ported the module and we can add it to the Qt5 set now. Change-Id: I146e60f6f18dcf7a00775e532e715e3718644edc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Really add qttools to the buildSimon Hausmann2019-09-061-2/+2
| | | | | | | | | | | | | | ... and not qtscript accidentally, like in the previous change. Change-Id: Ic8cd85ef7b149ffee7bc85ffa3fc9075f8a77c1b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Disable qtscript for the cmake buildSimon Hausmann2019-09-061-2/+2
| | | | | | | | | | | | | | The module has not been ported. Change-Id: I99041e00fb30b2a9799ee3e948f255422bbc6976 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Re-enable qttools for use with cmakeSimon Hausmann2019-09-061-2/+2
| | | | | | | | | | Change-Id: I040b8769af22290a986ccac476f30e7eed78b3e4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Include qtimageformats and qtnetworkauth in wip/cmakeLiang Qi2019-09-051-4/+4
| | | | | | | | | | Change-Id: I9f451ef08663a635ca05427735a31da895a68607 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Include qtgraphicaleffects in wip/cmakeLiang Qi2019-09-051-2/+2
| | | | | | | | | | Change-Id: Ie8fd5d478caa1d16cdea3c06a9b7cfeeb7dcd0cc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Include qtdeclarative in wip/cmakeLiang Qi2019-09-041-2/+2
| | | | | | | | | | Change-Id: I9d23a60fbd88e30ee688532dbe5112dd3245b9a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Include qtsvg in wip/cmakeLiang Qi2019-08-301-2/+2
| | | | | | | | | | Change-Id: I6df7b31637e9512dc7fe92819741d01af3f87310 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-05-031-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/platform_configs/qtbase.txt Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
| * 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
| |/
* / Shrink build configurations and modulesSimon Hausmann2019-03-131-40/+40
|/ | | | | | | | | | | This change disables all modules except qtbase from the build and also reduces the build to one configuration. This is not intended to be merged back to qt5/dev but rather a starting point to build up cmake builds in the CI platform by platform and module by module. Change-Id: I899da885dacb32188a0d02b2301df3d4450c0589 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 09:57:50 +0000