aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* Adjust submodule branchesFrederik Gladhorn2019-05-211-40/+40
|
* 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
* 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>
* 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
| * qtremoteobjects has QML pluginsThiago Macieira2017-06-041-0/+1
| | | | | | | | | | | | Change-Id: Ia3e896da908f42939148fffd14c47ef303f5d0e7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-261-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
| | * Merge remote-tracking branch 'origin/5.6' into 5.9.0Liang Qi2017-05-081-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
| | | * get rid of custom 'qt' gitmodules propertyOswald Buddenhagen2017-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead, re-use the (also custom) 'project' property with the magic value '-' to flag modules which contain no project files at all. Change-Id: I33163c098852e1b79ad698115aac98217efe1157 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * | Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-051-7/+7
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
| | * | Adjust submodule branchesOswald Buddenhagen2017-04-271-41/+41
| | | | | | | | | | | | | | | | Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951
| * | | Change qt3d dependency on qtimageformats to optionalTasuku Suzuki2017-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only examples use webp from qtimageformats. Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | make sure that all submodule urls end in .gitOswald Buddenhagen2017-05-021-5/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | http(s) needs that. Started-by: Alvaro Denis <denisacostaq@gmail.com> Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Switch qtspeech & qtnetworkauth from tp to addonJani Heikkinen2017-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtspeech and qtnetworkauth aren't technology preview modules anymore from Qt 5.10 -> Task-number: QTBUG-61436 Change-Id: I1a88f554498461a81ee80f435fccad7d0e542abf Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Add qtwebglpluginJesus Fernandez2017-06-281-0/+7
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-61443 Change-Id: I0a139c68c41cfa11d110fab1d7c97276c4d022a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-091-0/+1
|\| | | | | | | | | | | Change-Id: I88192479624510cb34227f401d9e8b07977f9711
| * | Merge remote-tracking branch 'origin/5.6' into 5.9Liang Qi2017-04-081-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules qt.pro Commit ed8f84f149f6901cbca50d145b25fe5f43a2d54c (webengine needs tools) together with commit 5656b4848e8c8bf60274c36094dede63aa93e89b (webkit needs webengine) creates a circular dependency with qttools also depending on webkit. So this commit breaks it by swapping the serialization order between webkit and webengine. Change-Id: I36309908adb754072495e02785ad158f8b389548
| | * serialize build of qtwebkit and qtwebengineOswald Buddenhagen2017-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linking both at the same time requires more than my 16GB of RAM, so introduce a .gitmodules field which serializes the two. in practice, it is just interpreted as an optional dependency. the CI system won't be taught about it, so this will not cause an unnecessary serialization there. Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-281-1/+1
|\| | | | | | | | | | | Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
| * | Recommend qtquickcontrols2 for qtlocationPaolo Angelelli2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The MapViewer example now uses qtquickcontrols2 sliders. This patch adds the related dependency Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 22:27:46 +0000