aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/7.0'9.08.0Eike Ziller2022-02-242-70/+0
|\ | | | | | | Change-Id: Icbc3dfa1c0795fc0b410614348c6c8bf7a7b5edb
| * Remove qmake build files7.0Eike Ziller2022-01-262-70/+0
|/ | | | | Change-Id: I09da5991f183e737da84ed3bc659970969ce1a89 Reviewed-by: hjk <hjk@qt.io>
* Add clang-format file and ignore CMake .user files6.05.04.15Eike Ziller2021-02-082-3/+118
| | | | | Change-Id: Ie218b119843ff91dc34e0fbad0da74c091f5d6da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.10'4.144.124.11Eike Ziller2019-08-271-0/+24
|\ | | | | | | Change-Id: I80be757d35e21e5b9ead165b7aef50d120a2619b
| * Add cmake build file4.10Eike Ziller2019-08-191-0/+24
|/ | | | | | Change-Id: Iffe985fa1a9eb918548536e7509c1f2a49d92022 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-05-131-4/+4
|\ | | | | | | Change-Id: Ib8f954673e75a8eb7774bb634226ee29e3ca57ae
| * Fix checking out submodules from code.qt.io4.9Eike Ziller2019-05-131-4/+4
| | | | | | | | | | | | | | That wants the .git postfix (codereview doesn't require it) Change-Id: Ifa20b4030b9d903c9d726338443179d96561ae46 Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-03-051-4/+4
|\| | | | | | | Change-Id: I062ec94a64fa2f2bfcdf37c6a4491d4c6b57ca24
| * Fix gitmodules' branchesEike Ziller2019-03-051-4/+4
|/ | | | | | | | | | Change the branch specification to '.' to make this unnecessary in the future. The dot makes it use the same branch as the repository that you have checked out of the super repository. Available since git version 2.10. Change-Id: Ibd753a38bb4d4b701f5f107b2f426d511983a132 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.8'Eike Ziller2019-01-312-4/+10
|\ | | | | | | Change-Id: I75b1e78423bee6518d77a8f2cec7eda971df619b
| * Fix branches for submodules4.8Eike Ziller2018-11-121-4/+4
| | | | | | | | | | Change-Id: I856d49d232a875389cb1ec3af7a36db4dd690f7a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Add gitignoreEike Ziller2018-09-191-0/+6
|/ | | | | Change-Id: I691523208356c94474780cd361adfcc167741e8d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add submodule for PythonExtensionsEike Ziller2018-08-172-0/+5
| | | | | Change-Id: I6931297d6acc5facc3de34d05587f8ade8803e7c Reviewed-by: hjk <hjk@qt.io>
* Simplify Qbs setup4.6Eike Ziller2017-10-131-29/+24
| | | | | | | | We require Qbs 1.8 now, which enables us to do autodetection of the available plugins Change-Id: Ia2140965494b70e92aa27cdd7c73aa46646f8714 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add Haskell pluginEike Ziller2017-10-132-0/+5
| | | | | Change-Id: Ib1e97f983c93f54031dbfe89796a3d0f2f42a6e3 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-110-0/+0
|\ | | | | | | Change-Id: Ie34e60078e0b0cb99c78e29b0a02972b9803654a
| * Merge remote-tracking branch 'origin/4.4' into 4.54.5Eike Ziller2017-10-111-2/+2
|/| | | | | | | Change-Id: I85103fe150fee03027b288f9d1b934330d870b0b
| * Fix submodule branches4.4Eike Ziller2017-10-061-2/+2
|/ | | | | Change-Id: Ia316835250aff7b10fcff38a0596b764e49da671 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Add Fossil SCM pluginEike Ziller2017-02-165-3/+120
| | | | | | | | | | | | | | | | | submodules.pri is derived from qt5/qt.pro, starting from "# Extract submodules", with a few differences: - removed setting QMAKE_INTERNAL_INCLUDED_FILES - renamed QT_BUILD_MODULES and QT_SKIP_MODULES to QTC_* and removed corresponding argument parsing - removed handling of module.$${mod}.qt - made it look for the module .pro file in the module.$${mod}.path - renamed the sub targets in the Makefile to sub-<module> Change-Id: I4e29027169ce7260b029eef33789814fa20ffc99 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Artur Shepilko <artur.shepilko@nomadbyte.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Initial setup with Qt Creator submoduleEike Ziller2017-02-146-0/+69
| | | | | | | | | | So far without any helper scripts for setting up submodules for work, but let's get started. Change-Id: I3ea949e21d8e6e52b6c30052351ce23f9028ab1e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Initial empty repositoryOswald Buddenhagen2016-11-160-0/+0