summaryrefslogtreecommitdiffstats
path: root/.gitmodules
Commit message (Expand)AuthorAgeFilesLines
* Deprecate QtXmlPattern moduleAlex Blasche2019-04-081-1/+1
* Adjust submodule branchesPaul Wicking2019-01-281-40/+40
* Add qtlottie as a submodule in qt5.git#devJani Heikkinen2019-01-251-0/+6
* Remove Qt Canvas3D from qt5.git (Qt 5.13 ->)Jani Heikkinen2019-01-211-1/+1
* Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-021-3/+3
|\
| * Merge remote-tracking branch 'origin/5.12.0' into 5.12Liang Qi2018-12-221-3/+3
| |\
| | * Add 'qttools' dependency for WebEngineMichal Klocek2018-11-051-1/+1
| | * Graduate qtremoteobjects and qtwebglpluginLiang Qi2018-11-021-2/+2
| | * Adjust submodule branchesOswald Buddenhagen2018-10-221-40/+40
| |/
* | Ensure qtserialport is treated as optional dependency for qtserialbusAlex Blasche2018-12-121-1/+2
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-10-201-2/+2
|\ \ | |/
| * Make quickcontrols1/2 and webchannel optional for webengineMichal Klocek2018-10-161-2/+2
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-08-311-1/+2
|\ \ | |/
| * Make xmlpatterns depend on declarativeFrederik Gladhorn2018-08-291-1/+2
| * Adjust submodule branchesOswald Buddenhagen2018-08-141-40/+40
|/
* Add soft qtdoc => qtquickcontrols 1/2 dependencySimon Hausmann2018-08-081-1/+1
* add soft dep qtdoc => qtmultimediaOswald Buddenhagen2018-08-081-0/+1
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-08-061-7/+0
|\
| * Remove broken qtquick1 submoduleFredrik Orderud2018-08-021-7/+0
* | Fix dependencies of the qtdoc moduleSimon Hausmann2018-07-311-1/+1
* | Remove qtenginioSimon Hausmann2018-04-131-6/+0
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-04-101-2/+2
|\ \ | |/
| * Don't require Qt Android Extras for Qt PurchasingEskil Abrahamsen Blomfeldt2018-04-051-2/+2
* | Merge remote-tracking branch 'origin/5.11' into devOswald Buddenhagen2018-02-071-6/+0
|\ \ | |/
| * Remove QtOpcUA from qt5.gitAlex Blasche2018-02-071-6/+0
* | Swap qtquickcontrols vs. qtquickcontrols2 statusesJ-P Nurmi2018-01-311-2/+2
* | Revert "Adjust submodule branches"Frederik Gladhorn2018-01-311-41/+41
|/
* Adjust submodule branchesOswald Buddenhagen2018-01-241-41/+41
* Revert "Temporarily ignore qtwayland"Liang Qi2018-01-071-1/+1
* Temporarily ignore qtwaylandLiang Qi2018-01-071-1/+1
* Revert "Temporarily ignore qtcanvas3d"Liang Qi2017-12-201-1/+1
* Temporarily ignore qtcanvas3dLiang Qi2017-12-201-1/+1
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-141-1/+0
|\
| * Don't recommend QtWebView in QtNetworkAuth moduleJesus Fernandez2017-11-031-1/+0
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-051-0/+1
|\ \ | |/
| * qtquickcontrols2: recommend qtimageformatsJ-P Nurmi2017-08-311-0/+1
| * Adjust submodule branchesOswald Buddenhagen2017-08-251-40/+40
* | Introduce qtopcua to top-level Qt buildsAlex Blasche2017-09-051-0/+6
|/
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-241-19/+3
|\
| * Remove QtWebKit and QtWebKit examples from Qt 5Simon Hausmann2017-08-151-17/+1
| * Make Qt3D depend on qtbase and optionally on qtdeclarativeHarald Vistnes2017-08-021-2/+2
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-141-8/+9
|\ \ | |/
| * qtremoteobjects has QML pluginsThiago Macieira2017-06-041-0/+1
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-261-1/+1
| |\
| | * Merge remote-tracking branch 'origin/5.6' into 5.9.0Liang Qi2017-05-081-1/+1
| | |\
| | | * get rid of custom 'qt' gitmodules propertyOswald Buddenhagen2017-04-271-1/+1
| | * | Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-051-7/+7
| | |\ \ | | |/ / | |/| |
| | * | Adjust submodule branchesOswald Buddenhagen2017-04-271-41/+41
| * | | Change qt3d dependency on qtimageformats to optionalTasuku Suzuki2017-05-041-2/+2
| * | | make sure that all submodule urls end in .gitOswald Buddenhagen2017-05-021-5/+5
| |/ /