aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13.1' into 5.13Liang Qi2019-08-091-2/+2
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I9b4e8807941f49ed930372cc3466c97110794849
| * Include QtWebEngine againLiang Qi2019-08-081-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit a94696ccd5be936099809eda58db02999cb7c77a partially. Task-number: QTBUG-77304 Task-number: QTBUG-77305 Change-Id: Iae17b2358d39a1d22271b2eb5c73b272a43adb28 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Merge remote-tracking branch 'origin/5.12' into 5.13.1Liang Qi2019-08-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/qtbase.yaml Change-Id: I964ffb430436c62ad675fabc853642800499ade3
| | * Include qtvirtualkeyboard againLiang Qi2019-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commit 452e0d94d40bba15a56293a0a0f7d093dececda9. Task-number: QTBUG-76371 Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge remote-tracking branch 'origin/5.13' into 5.13.1Liang Qi2019-08-061-2/+2
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Notice - qtvirtualkeyboard and qtwebengine got ignored temporarily due to issues on QEMU. Conflicts: .gitmodules Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
| * | Adjust submodule branchesFrederik Gladhorn2019-07-291-40/+40
| | | | | | | | | | | | Change-Id: I65388af02c1ab3608abf7e18a89966020e213d10
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-031-2/+2
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules ignore QtWebEngine on QEMU temporarily. coin/platform_configs/default.yaml no-gui build was removed temporarily. coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtconnectivity.yaml coin/platform_configs/qtsaferenderer.yaml Task-number: QTQAINFRA-2576 Task-number: QTBUG-77304 Task-number: QTBUG-77305 Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
| * Update submodules on '5.12' in qt5Liang Qi2019-06-181-1/+1
| | | | | | | | | | | | | | | | Ignore qtvirtualkeyboard temporarily. Task-number: QTBUG-76371 Change-Id: I6d62f0f60b30044baaef092cbd8066bbca8d0df7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | 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
* | Swap qtquickcontrols vs. qtquickcontrols2 statusesJ-P Nurmi2018-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | The Qt Quick Controls (1) module, which was still listed as an essential module, has not been actively developed for almost three years. Promote Qt Quick Controls 2 as an essential module instead, and demote Qt Quick Controls (1) as an addon. Change-Id: If51c6c17d199ca10a574053d7dba67539a764aba Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Revert "Adjust submodule branches"Frederik Gladhorn2018-01-311-41/+41
|/ | | | | | | | | This got merged accidentally. This reverts commit 282899453d2c6b4c51bbd94fc228f2bb711d64f6. Change-Id: I1457513217e636aa54b43a1dc21b01443c798119 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Adjust submodule branchesOswald Buddenhagen2018-01-241-41/+41
| | | | Change-Id: Id6fe05f393152581b8509fd613084df1f318bc54
* Revert "Temporarily ignore qtwayland"Liang Qi2018-01-071-1/+1
| | | | | | | | | | QtWayland adapted to new api in qtbase. This reverts commit eba433c1264d3272c9f1a8390ef2b7528e330e7b. Task-number: QTBUG-65600 Change-Id: If46f054adfb8a2db0d82acbd07cb39b2f512530e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Temporarily ignore qtwaylandLiang Qi2018-01-071-1/+1
| | | | | | | | | | | | | qtbase changed API, qssize_t was changed to qsizetype. In order for qtwayland to update, qt5 needs to update first; but in order for qt5 to update, qtwayland needs to compile. Ignoring breaks cycle. Task-number: QTBUG-65600 Change-Id: I978b0ed8dc86898ab1feb8b9cc47960e42095dfa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Revert "Temporarily ignore qtcanvas3d"Liang Qi2017-12-201-1/+1
| | | | | | | | | | QtCanvas3D adapted to new internal api in qtdeclarative. This reverts commit 146bda6468f966f64b3cc26a800798507154ef0d. Task-number: QTBUG-64766 Change-Id: I709cb8856b674edc1a7d3217fdf68cbe8aca1608 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Temporarily ignore qtcanvas3dLiang Qi2017-12-201-1/+1
| | | | | | | | qtdeclarative changed internal API. Task-number: QTBUG-64766 Change-Id: I7a0bbcaf121bf852fc028be275e82a5658c132a0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-141-1/+0
|\ | | | | | | | | | | | | Conflicts: coin/platform_configs/qt5.txt Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
| * Don't recommend QtWebView in QtNetworkAuth moduleJesus Fernandez2017-11-031-1/+0
| | | | | | | | | | | | | | | | | | QtWebView is not used in QtNetworkAuth. There is no need to recommend the QtWebView module. Change-Id: I2dbb9d4024ada9436725f4dac643574b558fb9ae Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-051-0/+1
|\| | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/qt5.txt Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
| * qtquickcontrols2: recommend qtimageformatsJ-P Nurmi2017-08-311-0/+1
| | | | | | | | | | | | | | | | | | The new image-based style in Qt Quick Controls 2 uses WebP for animations. Change-Id: I42360fc29fbfdc1d85cab5ef37b57569e5af6901 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Adjust submodule branchesOswald Buddenhagen2017-08-251-40/+40
| | | | | | | | Change-Id: I24415b4ce9d74e9eb83420a55e9036d1b0785a73
* | Introduce qtopcua to top-level Qt buildsAlex Blasche2017-09-051-0/+6
|/ | | | | | Change-Id: Iaf9e137c0ae08cc527e14a394cfaf235dfce13fe Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-241-19/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/qt5.txt coin/provisioning/common/system_updates.sh coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
| * Remove QtWebKit and QtWebKit examples from Qt 5Simon Hausmann2017-08-151-17/+1
| | | | | | | | | | | | | | They are subject to a separate release. Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * Make Qt3D depend on qtbase and optionally on qtdeclarativeHarald Vistnes2017-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | This change will make the pure C++ libs of Qt3D be built even if qtdeclarative is skipped. Task-number: QTBUG-62256 Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-141-8/+9
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/qt5.txt Remove QNX Windows builds, 0358b6d2 Remove Integrity build temporarily, QTBUG-61702 coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh Done-with: Liang Qi <liang.qi@qt.io> Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 08:25:21 +0000