aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-071-5/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also integrated latest dev branch of qtremoteobjects and qtwebengine. Conflicts: .gitmodules qtremoteobjects qtwebengine Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-041-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
| | * | declare optional dependency of qtwebengine on qttoolsOswald Buddenhagen2017-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | starting with 5.7, it optionally comes with a qt designer plugin. Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | | Add qtremoteobjectsBrett Stottlemyer2017-02-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7e673d95b4930a93fc6d1a4aa86241061001bc2 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | Change qtgamepad status from preview to addonJani Heikkinen2017-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qtgamepad will be officially supported with Qt 5.9 Change-Id: I3f941189881f2ab32ef10d4fff242e0d075798f3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | Merge remote-tracking branch 'origin/5.8' into 5.9Simon Hausmann2017-02-051-3/+3
| |\| | | | | | | | | | | | | | Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
| | * | Merge remote-tracking branch 'origin/5.6' into 5.8Simon Hausmann2017-02-031-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
| | | * Revert "Clean up usage of qtsvg as dependency"Frederik Gladhorn2017-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtdeclarative has a runtime dependency, some tests rely on the svg module being available, so in order to not reduce the test coverage, revert this change. I'd like to see a better/cleaner separation, but for the time being, better coverage wins. This reverts commit fbd782636b6ee413d2b6e8bca408263297194254. Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | Adjust submodule branchesOswald Buddenhagen2017-01-251-40/+40
|/ / / | | | | | | | | | Change-Id: Ifd38a97f7b51138504e8d7ace030a175640bc216
* | | Merge remote-tracking branch 'origin/5.8' into devSimon Hausmann2017-01-141-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also includes an update of the CI platform configurations to the values that were previously in the CI source tree for builds of the dev branch. This is done within the same change as the merge to preserve atomicity. Task-number: QTQAINFRA-1074 Change-Id: Ic47f7db3506ace4faca028b902d48cdb009c8495
| * | Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2016-12-051-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I749924de83f87e436448bf1287fe057e2fe4c45b
| | * \ Merge remote-tracking branch 'origin/5.7' into 5.8.0Liang Qi2016-12-021-3/+3
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
| | | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-171-3/+3
| | | |\| | | | | | | | | | | | | | | | Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
| | | | * Clean up usage of qtsvg as dependencyFrederik Gladhorn2016-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no build dependency on QtSvg in qtdeclarative or qtquick1, so don't recommend it for builds. QtSensors on the other hand has an example that does need svg. This does not change anything in the big picture, the svg module will be built as always and svg files will be displayed. The change is the ordering of builds (leave more room for parallelization). Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * | | Adjust submodule branchesOswald Buddenhagen2016-11-211-40/+40
| |/ / / | | | | | | | | | | | | Change-Id: I154feb1976da9853cb4de7e70a4962ad0a6b4067
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-301-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-301-1/+1
| |\| | | | | | | | | | | | | | Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-09-281-1/+1
| | |\| | | | | | | | | | | | | Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
| | | * Add Qt Android Extras as dependency for Qt PurchasingEskil Abrahamsen Blomfeldt2016-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| | * | fix branches of qtpim and qtsystemsOswald Buddenhagen2016-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these repos were definitely _not_ branched for 5.7. Change-Id: Ib31d4e07f2651cfba0a7d31a9db1f1a812061313 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Remove qtsystems from the list of recommended modules in qtlocationSimon Hausmann2016-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtSystems is not a supported module at the moment, and the code in QtLocation to utilize QtSystems is behind an #ifdef and destined for removal. Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Removed TP status from qtscxml and qtserialbusJani Heikkinen2016-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | | Merge remote-tracking branch 'origin/dev' into 5.8Oswald Buddenhagen2016-08-241-2/+9
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Note that this also contains the adjustment of the branch for the latecomers qtspeech and qtnetworkauth. Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
| * | | Adjust submodule branchesOswald Buddenhagen2016-08-081-38/+38
| | | | | | | | | | | | | | | | Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
* | | | Add qtnetworkauthJesus Fernandez2016-08-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4cd81725d0aec29ff3252a84504a81a44d1b60eb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | | | Make QtSpeech a tech preview release for Qt 5.8Frederik Gladhorn2016-08-171-1/+1
|/ / / | | | | | | | | | | | | | | | Change-Id: I144109a45bece4b2283c24ad7aae64c098f86963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-241-39/+50
|\| | | | | | | | | | | Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-101-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
| | * | Fix status of qtquick1 and enginioSimon Hausmann2016-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The right term is "ignore" in order to ignore the module, not "ignored". Change-Id: Idd4a887834fc98fffb2b9e8385308aa676ba3adf Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | Set qtquick and enginio to ignored stateJani Heikkinen2016-05-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was agreed at the Qt Contributor Summit 2015 that QtQuick1 will be removed completely from the packages and not even compiled during qt5.git integration. Enginio is also removed from 5.7.0 so ignoring it as well Change-Id: I80ac88d28f811fbf731e33d4d4353a249ad6d29a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Adjust submodule branchesOswald Buddenhagen2016-05-131-40/+40
| |/ / | | | | | | | | | Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 20:36:10 +0000