aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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>
* | Adjust submodule branchesOswald Buddenhagen2016-08-081-38/+38
|/ | | | Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
* 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
| * Update qtquickcontrols2 status as "addon" for Qt 5.7Iikka Eklund2016-04-211-1/+1
| | | | | | | | | | | | | | | | | | qtquickcontrols2 is not in preview state anymore for Qt 5.7. Change-Id: Ib9d3616e7605beabb9bb9f0b0cb1b79a8d499ebd Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Added qtdeclarative and qtmultimedia as optional dependencies for qtspeechv5.7.0-beta1Dominik Holland2016-04-131-0/+1
| | | | | | | | | | Change-Id: I20602133a2156b162e99432f868e4925469c7ff5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Update 5.7 module statusJani Heikkinen2016-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | In Qt 5.7 enginio is obsolete and Qt3D addon, not TP anymore Change-Id: I019f76162cfcc853b542695245a983f151f1b072 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-051-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
| | * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-03-311-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
| | | * Update .gitmodules for automated release src package creationv5.6.0Iikka Eklund2016-03-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new "deprecated" value for status attribute. We have two flavors of big source packages we need to produce: qt-everywhere-* which needs to include: - essential - addon - preview - deprecated (e.g. qtscript and qtenginio for Qt5.6 release) Installer only specific source package: - essential - addon The rest (deprecated, preview, ...) need to be shown as split src packages in the installer. The above leads to the following changes: qtscript: addon -> deprecated Needs to be part of big src packages but excluded from installer specific big source package. qtenginio: obsolete -> deprecated We can't exclude this module from qt-everywhere src packages. qtwayland: preview -> addon Needs to be part of installer specific big src package and the module status is not preview anymore. Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | | QQC2 doesn't depend on QQC1BogDan Vatra2016-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QQC2 depends on qtgraphicaleffects. Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * | | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Simon Hausmann2016-02-241-38/+47
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-02-191-38/+47
| | |\| | | | | | | | | | | | | | | | | Change-Id: I2bc1389ece7f12efc334f0292edbbea837f9adc2
| | | * | Merge remote-tracking branch 'origin/5.6.0' into 5.6Oswald Buddenhagen2016-02-121-33/+42
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
| | | | * fix branches of some modulesOswald Buddenhagen2016-02-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all repos which are released (whichever way) need release branches. and vice versa. also, it needs to be the *right* release branch. Task-number: QTBUG-50695 Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | | | * replace 'initrepo' with more fine-grained 'status'Oswald Buddenhagen2016-02-071-32/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of a simple bool, we now have five states: preview, active, addon, obsolete, and ignore (the default). the default includes the first three. the CI system is expected to use --module-subset=all,-ignore to include everything that is expected to build (in some configurations). Change-Id: Ifb43412054a8e42db0425f24f8e53acfce363caa Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | | | * Adjust submodule branchesOswald Buddenhagen2016-01-251-30/+30
| | | |/ | | | | | | | | | | | | Change-Id: Id78b6c131063a8d25616282cd3b76815323e8048
| * | / Enable QtGamepad usage in Qt3DBogDan Vatra2016-02-221-0/+1
| |/ / | | | | | | | | | | | | | | | | | | If Qt3D finds QtGamepad, it will use it to build gamepad support. Change-Id: Ifbc40e5e04a6030d25c2d429878d4fb3a3dd11a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * / Adjust submodule branchesOswald Buddenhagen2016-02-121-42/+42
|/ / | | | | | | Change-Id: I3484da8952951d818e9f584bf9b57e9bb9b1e430
* | Fix datavis3d dependenciesSimon Hausmann2016-02-121-1/+1
| | | | | | | | | | | | | | | | The qtmultimedia dependency was missing for datavis3d. Change-Id: I91007c210e58aa9985844a8234781356391bfbad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | add qtgamepad, qtscxml, and qtspeechOswald Buddenhagen2016-02-121-0/+18
| | | | | | | | | | Change-Id: I14bc475d44367a9102e896976eba5bd191ee232d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Add charts, data visualization and virtual keyboard modulesMiikka Heikkinen2016-01-251-0/+21
| | | | | | | | | | Change-Id: I53cbc4ce3c2e44687ce454498f5def820614db85 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-221-0/+65
|\| | | | | | | Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
| * move module dependencies from qt.pro to .gitmodulesOswald Buddenhagen2016-01-221-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | this removes the last redundant module list. the module build order which is not determined by dependencies is pretty random now. this is avoided for a few heavy and "less relevant" modules by setting a priority to built them as late as possible. Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Enable qtpurchasing by defaultLiang Qi2015-12-161-0/+1
| | | | | | | | | | Change-Id: I4030b9f446a865e758492e2f07b8adb19052e91d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-151-0/+4
|\| | | | | | | Change-Id: Ibd5caf0448c9eba9251bc9395fe647f1955743f0
| * Add qtpurchasing as non-default moduleFrederik Gladhorn2015-09-241-0/+4
| | | | | | | | | | | | | | For 5.6 this is a tech preview, it will be added properly in 5.7. Change-Id: I709830fbcfc439d5446718093f0c16ad2dcb1e57 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devOswald Buddenhagen2015-09-181-3/+14
|\| | | | | | | | | | | | | | | | | Conflicts: .gitmodules qtquickcontrols2 qtwebview Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
| * Add QtQuickControls2 as submodulev5.6.0-alpha1Frederik Gladhorn2015-09-031-0/+5
| | | | | | | | | | Change-Id: I435fb765b48a978763384226e399b33448a40502 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Hook qtserialbus into qt5.gitAlex Blasche2015-09-031-0/+4
| | | | | | | | | | Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Add qtwebview as submoduleFrederik Gladhorn2015-09-031-0/+5
| | | | | | | | | | | | Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Removed QtWebkit and QtWebkit-Examples from qt5.gitJani Heikkinen2015-09-031-2/+0
| | | | | | | | | | | | | | | | | | QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now be removed from qt5.git in Qt5.6 release Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * Fix QtEnginio branchSimon Hausmann2015-09-031-1/+1
| | | | | | | | | | | | | | | | | | The 1.3 branch does not exist anymore, let's use 5.6 Change-Id: I442ad45c73a0e08c853385c999dddf818447bb82 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Remove quick1 from default checkoutJani Heikkinen2015-08-271-1/+0
| | | | | | | | | | | | | | | | QtQuick1 was deprecated in Qt 5.5 and will now be removed from default modules in qt5.git Change-Id: I88aa9d75ace8d91b4cd469d7511662425e67d95f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * fix qtcanvas3d submodule referenceOswald Buddenhagen2015-08-121-1/+1
| | | | | | | | Change-Id: I67d89f5e8d04a1e60ff0aedc33e29da7a58df620
| * Adjust submodule branchesOswald Buddenhagen2015-08-101-31/+31
|/ | | | Change-Id: I7755bb88167297aef9defaa6b66639fde6e9804d
* Merge remote-tracking branch 'origin/5.5' into devOswald Buddenhagen2015-03-201-0/+1
|\ | | | | | | Change-Id: I44a6915c1212bb636456368a2b5dc36b9c26fe01
| * Added Qt3D as a part of qt5.git default repositoriesJani Heikkinen2015-03-131-0/+1
| | | | | | | | | | Change-Id: I0e74e6c6ab6c347396c449859b1cf24752a42fb8 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
| * Adjust submodule branchesOswald Buddenhagen2015-02-161-31/+31
|/ | | | Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93
* Add qtcanvas3d as submodulePasi Keranen2015-02-131-0/+5
| | | | | | | | [ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick. Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* adjust submodule branch names for dev branchOswald Buddenhagen2014-12-051-29/+29
| | | | | Change-Id: I65ea644943aa345b8f0fd1d5fcdfccf8f86ed914 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* adjust submodule branch names for 5.4 branchOswald Buddenhagen2014-12-021-29/+29
| | | | | | Change-Id: I1621fee44becf1940d7d50a604fa8c91f3be78d9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* teach init-repository about branchesOswald Buddenhagen2014-11-121-0/+36
| | | | | | | | specifically, add the --branch option and the necessary keys to .gitmodules. Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 05:36:37 +0000