aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove QtOpcUA from qt5.gitAlex Blasche2018-02-071-6/+0
| | | | | | This module is moved to tqtc-qt5. Change-Id: I57641392be0a968dfd51633fcba15e38de45abcd
* 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>
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 12:07:07 +0000