aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
* 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>
* 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>
* 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>
* Adding qtquick1 and qtwayland also into submodule initializationMatti Paaso2014-09-251-0/+2
| | | | | | | | | | | Without these components, src package creation fails in packaging. Change-Id: I402c9c49642bccf821c3719206d1dea9415760c6 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove qtjsondbJoerg Bornemann2014-09-231-3/+0
| | | | | | | | | It's dead, Jim. Change-Id: Id8e1ddb266018bfd582af27bb7eb860287e4567c Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* keep information about default repos in .gitmodulesOswald Buddenhagen2014-09-231-0/+29
| | | | | | | it's backwards to keep this in the script itself. Change-Id: I4248ba3fef984bdff5d034cb2e6db6cae3209d68 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add qtwebengine as submoduleFrederik Gladhorn2014-08-291-0/+3
| | | | | | | | | | | qtwebkit is listed as an optional dependency for qtwebengine to ensure that qtwebkit and qtwebengine are not linked in parallel on the CI system. Otherwise we could run out of memory. Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add qtwebchannel as submoduleFrederik Gladhorn2014-08-081-0/+3
| | | | | | | | This also updates the qtwebsockets revision since that's needed to compile. Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* nuke qlalr submoduleOswald Buddenhagen2014-02-221-3/+0
| | | | | | | | it was merged back into qtbase. Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add qtwebsockets as submoduleFrederik Gladhorn2014-02-171-0/+3
| | | | | | | | | | | This just adds the module, it doesn't yet make it part of Qt 5.3 or anything like that Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add qtenginio as submoduleFrederik Gladhorn2013-11-011-0/+3
| | | | | Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add new qtandroidextras repositoryv5.2.0-alpha1Sergio Ahumada2013-09-271-0/+3
| | | | | | | Also adding it as part of the default modules. Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* purge qtjsbackendOswald Buddenhagen2013-08-171-3/+0
| | | | | | Change-Id: Ic761324c7b7afdfd509bea1db0d75ba259f8fb94 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Add qtmacextras and qtwinextras to qt5.git#stableSergio Ahumada2013-06-261-0/+6
| | | | | Change-Id: I440e8ad733feaadb07e74fb91342434f66bae160 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* use relative submodule specsOswald Buddenhagen2013-05-011-32/+32
| | | | | | | | | | this saves various trouble. this syntax is supported since git 1.7.0. Change-Id: I5bbc31c2ba01e7ec0129bf45b9f704c380bf11a3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* renamed qtwebkit-examples-and-demos => qtwebkit-examplesOswald Buddenhagen2013-05-011-3/+3
| | | | | | Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Add new modules (qtquickcontrols, qtserialport and qtx11extras)v5.1.0-alpha1Sergio Ahumada2013-04-041-0/+9
| | | | | | | | Also adding qtsensors as part of the default modules and updating its sha1. Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da Reviewed-by: David Faure (KDE) <faure@kde.org>
* re-add a bunch of modulesOswald Buddenhagen2013-04-031-0/+33
| | | | | | | | | | | | | | | this allows for easy cloning and build system maintenance also for modules which are currently irrelevant, thus hopefully keeping the barrier to their revival low. it does not affect the casual developer or the CI system, as init-repository will not clone these modules. This (abstractly) reverts commits 41c3f2cb5f633f0e540482ca01b2c2caa2475e57, 725a51b1d83626e16989804707356baa909c339f and 1117d4da2caf1989f63ca0a8073a799df80428bc. Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove special handling of qtwebkitOswald Buddenhagen2012-11-301-3/+3
| | | | | | | | | | | the svn mirror is now CI-controlled on gerrit and mirrored to gitorious like any other qt module. Change-Id: I05ead0a4aaa4fc5348a3e3d39d9ee7db734580f4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Remove submodules which are not part of Qt 5.0.Stephen Kelly2012-10-301-27/+0
| | | | | | | | Task-number: QTBUG-27736 Change-Id: I737515d2cfe687448a03b67ce9f2c14d108f2a1d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove qtjsondb from qt5.gitLars Knoll2012-08-281-3/+0
| | | | | | | | | | | | | | The jsondb module has been ongoing research work. But it won't be done in time for Qt 5.0, and is currently also less relevant. It's also currently not being actively worked on. So let's remove it from the list of modules compiled with qt5.git and keep it as research. The module can still be compiled stand-alone on top of the Qt essentials. Change-Id: I6fd4524cae43b803a842788ff22a7525dc7bc0e6 Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
* Remove docgallery from qt5.gitLars Knoll2012-08-061-3/+0
| | | | | | | | | | | | The document gallery has been pretty much unmaintained for a year now and the only backends we have are for tracker (ie. the N9), the deprecated jsondb client API and the simulator. it doesn't work anywhere else currently. Change-Id: I5c12e23be7ed8862e891e996fbd6191e79f4fdef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Remove phonon as discussed on the mailing listLars Knoll2012-07-301-3/+0
| | | | | | | | | | phonon's upstream is in KDE's repositories and the port to Qt 5 on qt-project is not maintained. So it's only logical to remove it. KDE frameworks 5 will hopefully provide a phonon module for Qt 5 again in the future. Change-Id: I30189d921913868f2253841648ba57b2aaf3650c Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Added new module, qtgraphicaleffects.Sergio Ahumada2012-03-031-0/+3
| | | | | | | Not yet enabled by default. Change-Id: I96d770c504281c8e6bb452d6742ea555c1c7405c Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Add the QtQuick1 module.Andrew den Exter2012-02-091-0/+3
| | | | | Change-Id: I3afda68e1fa1dad4e264cea6e5afbd73d858c547 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add qtimageformats module to Qt5.Toby Tomkins2012-01-311-0/+3
| | | | | | Change-Id: Ie168a1a450b8090d4aa934a21e991c67683ef5de Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QtQuick3D repository references from Qt5.Toby Tomkins2012-01-251-3/+0
| | | | | | | | | | | | | | | Qt3D had temporarily resided in the Qt5 repository under qtquick3d. There is now a qt3d submodule which is compiling and testing correctly. Qt5 had previously removed support for building the qtquick3d submodule by default. This commit is the final step in cleaning up the previous version. Task-number: QTBUG-22098 Change-Id: I39fdbd7c58a0076c288d8c0570e892b5d0df4ff9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Added qtjsbackend moduleSimon Hausmann2012-01-101-0/+3
| | | | | | Change-Id: I179a5714a12144e6815d931fef9fbfcedee6c93f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated WebKit importSimon Hausmann2012-01-091-1/+1
| | | | | | | | | | | | | | The repository pointed at is now significantly smaller and contains a snapshot of WebKit only, excluding content like layout tests or their platform specific results. In addition the phonon dependency in qt.pro has been removed from WebKit, as it is not accurate. Change-Id: Ic2721435a6ce2328d11c1a8f5d9ce1881fc8ebb3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Added new gitmodule `qt3d'Rohan McGovern2011-12-191-0/+3
| | | | | | | | | To replace qtquick3d. This commit introduces qt3d, a follow-up commit will remove qtquick3d. Change-Id: I3d1b46e7e1e32960351f02ec22a6e555203f988a Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Added new module, qtjsondb.Sergio Ahumada2011-10-311-0/+3
| | | | | | | | | Not yet enabled by default. Change-Id: I07093f8770a7b2f05aa777cbf949a30478dacc67 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Remove QtMultimediaKit - all content has moved to QtMultimedia.Michael Goddard2011-10-271-3/+0
| | | | | | Change-Id: I54741996cb3dbfbb76dd0f864e4e72cd8b6bbd67 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 03:24:52 +0000