aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Expand)AuthorAgeFilesLines
* Remove qtsystems from the list of recommended modules in qtlocationSimon Hausmann2016-08-281-1/+1
* Removed TP status from qtscxml and qtserialbusJani Heikkinen2016-08-241-2/+2
* Merge remote-tracking branch 'origin/dev' into 5.8Oswald Buddenhagen2016-08-241-2/+9
|\
| * Add qtnetworkauthJesus Fernandez2016-08-221-0/+7
| * Make QtSpeech a tech preview release for Qt 5.8Frederik Gladhorn2016-08-171-1/+1
* | Adjust submodule branchesOswald Buddenhagen2016-08-081-38/+38
|/
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-241-39/+50
|\
| * Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-101-2/+2
| |\
| | * Fix status of qtquick1 and enginioSimon Hausmann2016-05-261-2/+2
| | * Set qtquick and enginio to ignored stateJani Heikkinen2016-05-241-2/+2
| | * Adjust submodule branchesOswald Buddenhagen2016-05-131-40/+40
| |/
| * Update qtquickcontrols2 status as "addon" for Qt 5.7Iikka Eklund2016-04-211-1/+1
| * Added qtdeclarative and qtmultimedia as optional dependencies for qtspeechv5.7.0-beta1Dominik Holland2016-04-131-0/+1
| * Update 5.7 module statusJani Heikkinen2016-04-111-2/+2
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-051-2/+2
| |\
| | * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-03-311-3/+3
| | |\
| | | * Update .gitmodules for automated release src package creationv5.6.0Iikka Eklund2016-03-081-3/+3
| * | | QQC2 doesn't depend on QQC1BogDan Vatra2016-02-281-1/+1
| * | | 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
| | |\| |
| | | * | Merge remote-tracking branch 'origin/5.6.0' into 5.6Oswald Buddenhagen2016-02-121-33/+42
| | | |\|
| | | | * fix branches of some modulesOswald Buddenhagen2016-02-071-6/+6
| | | | * replace 'initrepo' with more fine-grained 'status'Oswald Buddenhagen2016-02-071-32/+41
| | | | * Adjust submodule branchesOswald Buddenhagen2016-01-251-30/+30
| | | |/
| * | / Enable QtGamepad usage in Qt3DBogDan Vatra2016-02-221-0/+1
| |/ /
| * / Adjust submodule branchesOswald Buddenhagen2016-02-121-42/+42
|/ /
* | Fix datavis3d dependenciesSimon Hausmann2016-02-121-1/+1
* | add qtgamepad, qtscxml, and qtspeechOswald Buddenhagen2016-02-121-0/+18
* | Add charts, data visualization and virtual keyboard modulesMiikka Heikkinen2016-01-251-0/+21
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-221-0/+65
|\|
| * move module dependencies from qt.pro to .gitmodulesOswald Buddenhagen2016-01-221-0/+65
* | Enable qtpurchasing by defaultLiang Qi2015-12-161-0/+1
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-151-0/+4
|\|
| * Add qtpurchasing as non-default moduleFrederik Gladhorn2015-09-241-0/+4
* | Merge remote-tracking branch 'origin/5.6' into devOswald Buddenhagen2015-09-181-3/+14
|\|
| * Add QtQuickControls2 as submodulev5.6.0-alpha1Frederik Gladhorn2015-09-031-0/+5
| * Hook qtserialbus into qt5.gitAlex Blasche2015-09-031-0/+4
| * Add qtwebview as submoduleFrederik Gladhorn2015-09-031-0/+5
| * Removed QtWebkit and QtWebkit-Examples from qt5.gitJani Heikkinen2015-09-031-2/+0
| * Fix QtEnginio branchSimon Hausmann2015-09-031-1/+1
| * Remove quick1 from default checkoutJani Heikkinen2015-08-271-1/+0
| * fix qtcanvas3d submodule referenceOswald Buddenhagen2015-08-121-1/+1
| * Adjust submodule branchesOswald Buddenhagen2015-08-101-31/+31
|/
* Merge remote-tracking branch 'origin/5.5' into devOswald Buddenhagen2015-03-201-0/+1
|\
| * Added Qt3D as a part of qt5.git default repositoriesJani Heikkinen2015-03-131-0/+1
| * Adjust submodule branchesOswald Buddenhagen2015-02-161-31/+31
|/
* Add qtcanvas3d as submodulePasi Keranen2015-02-131-0/+5
* adjust submodule branch names for dev branchOswald Buddenhagen2014-12-051-29/+29
* adjust submodule branch names for 5.4 branchOswald Buddenhagen2014-12-021-29/+29
* teach init-repository about branchesOswald Buddenhagen2014-11-121-0/+36