aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adapt to upstream changeHEADmasterChristian Stenger2023-01-243-9/+2
| | | | | Change-Id: I2d3535f579f0e5c9e350bc548e59fc43189b2a8b Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/9.0'Eike Ziller2023-01-091-1/+1
|\ | | | | | | Change-Id: I84be98d86f417de8792873e4464975cb5b118008
| * GitHub: Use Qt 6.4.29.0Eike Ziller2023-01-091-1/+1
| | | | | | | | | | Change-Id: I7e5b59f1ac6799d437c63c59dfe0e8a227d28c85 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | GitHub: Build against 10.0.0-beta1Eike Ziller2023-01-041-2/+2
| | | | | | | | | | Change-Id: I58e780afaf26354a4d145b6c2065a00f5c0f1255 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/9.0'Eike Ziller2023-01-021-4/+10
|\| | | | | | | Change-Id: I1536d098f9917bcddfa194f8672aef4c1f13a0fc
| * GitHub: Update deployment target and architectures on macOSEike Ziller2023-01-021-1/+7
| | | | | | | | | | | | | | | | We only support macOS 10.14 with Qt Creator 9, and we do support Apple ARM for a while now. Change-Id: I27a1e95b7a338a45fe1e572bd2cd9cd96188f0dc Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * GitHub: Update to Qt Creator 9.0.0 and Qt 6.4.1Eike Ziller2022-11-241-3/+3
| | | | | | | | | | Change-Id: I253db2ee66b48dc873ccba76f7c7b1ce11b4c07f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/9.0'Eike Ziller2022-10-141-2/+2
|\| | | | | | | Change-Id: I8778eeb68b3ac4bbb406c3389b96d3a8200875e5
| * GitHub: Build against QtC 9 Betav9.0.0-beta1Eike Ziller2022-10-121-3/+3
| | | | | | | | | | Change-Id: Ibcbf8426b6d12c03b36bf0bdb9633829ab198932 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Merge remote-tracking branch 'origin/8.0' into 9.0Eike Ziller2022-10-121-2/+2
|/| | | | | | | Change-Id: I196c37bfc97e729f1b95f77bbd1bfe0bbe15af43
| * GitHub: Build against Qt Creator 8 releasev8.0.08.0Eike Ziller2022-07-201-2/+2
| | | | | | | | | | Change-Id: I32172a50f69617a286c8574272a80cd3b2870fdb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Adapt to upstream changeChristian Stenger2022-09-081-1/+1
| | | | | | | | | | Change-Id: I4b02574a34900113ffad945ab661868ea8a2329c Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-07-124-12/+14
|\| | | | | | | Change-Id: If4ed9904a146f3ec5bba0530890198f55cf977bb
| * Adapt to upstream changesEike Ziller2022-06-291-3/+5
| | | | | | | | | | | | | | QtcProcess::errorOccurred has been merged into ::done. Change-Id: I4e84203d052bdfe6f7eb827ea83c90441a0c86d3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Fix compile after upstream header shufflingChristian Stenger2022-06-282-1/+1
| | | | | | | | | | Change-Id: I3f46a8543bfcb2b5436162f37fe33d1ba54c0842 Reviewed-by: hjk <hjk@qt.io>
| * GitHub: Build against Qt Creator 8 Beta2Eike Ziller2022-06-221-2/+2
| | | | | | | | | | Change-Id: I01be6bf7656af4a7e7f7729cb35a83cf6395fde2 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * GitHub: Build against Qt Creator 8 beta1v8.0.0-beta1Eike Ziller2022-06-201-8/+8
| | | | | | | | | | Change-Id: I7721410d20c5fcbd96589daa1acdea19ad213ce1 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Fix build after upstream changesEike Ziller2022-06-201-1/+1
| | | | | | | | | | Change-Id: I080a3da5eab5149a8e741781830e4359cbc518d4 Reviewed-by: hjk <hjk@qt.io>
* | Adapt to upstream changeChristian Stenger2022-05-311-1/+1
|/ | | | | Change-Id: I5645005108dcba9e854112fadd59fa42b25e87b1 Reviewed-by: hjk <hjk@qt.io>
* Adapt to upstream changeChristian Stenger2022-05-231-2/+2
| | | | | Change-Id: I717ec1019ca19014829a7705e8658d5f1129fad2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Adapt to upstream changeChristian Stenger2022-04-251-2/+2
| | | | | Change-Id: Ie67fbd15e9ea5196ecacf17afaadba3a5a488c3f Reviewed-by: hjk <hjk@qt.io>
* Fix include to avoid redefinition of MimeTypeChristian Stenger2022-03-111-1/+1
| | | | | Change-Id: Ib7a1b71026cb18832bf5fd33859795217285ecaa Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Adapt to upstream changeChristian Stenger2022-02-281-1/+1
| | | | | Change-Id: I149a572ce12a76909f23fa8d19777954dea8d6b0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Adapt to upstream changesChristian Stenger2022-02-231-1/+2
| | | | | | Change-Id: If09dfa0d55d103df41e3b95048d4b76e90eb67f6 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Adapt to upstream changesChristian Stenger2022-02-161-1/+2
| | | | | Change-Id: Ie6d5638a39b2c4a0be1a59d39511c5eca03b4f7b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Merge remote-tracking branch 'origin/6.0' into 7.0Eike Ziller2022-02-081-14/+21
|\ | | | | | | Change-Id: I6d7004982e1b0537c2abc32f5879f6eaf1b27ae8
| * GitHub: Use checkout@v2v6.0.06.0Eike Ziller2022-01-271-1/+1
| | | | | | | | | | | | | | Fixes security concerns of v1 Change-Id: I1fb72c3845611db239f6bed79b4768a7ceadccc8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * GitHub: Bump to QtC 6.0 and Qt 6.2.1Eike Ziller2021-12-021-3/+3
| | | | | | | | | | Change-Id: Ieaa124da0339a19b200b5e8ed7a676b44ba8889c Reviewed-by: David Schulz <david.schulz@qt.io>
| * GitHub: Build against Qt Creator 6 snapshot with Qt 6.2Eike Ziller2021-10-221-12/+19
| | | | | | | | | | Change-Id: I6fc5d1486c146748a62c41225e0f9796cd9abe1d Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Add test to CMake buildEike Ziller2022-01-263-3/+12
| | | | | | | | | | Change-Id: I92f4f54dde76d8234f93d293e250045152bfb8fd Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Remove qmake build filesEike Ziller2022-01-265-93/+0
| | | | | | | | | | Change-Id: Ia5160d6796d301051c5b02c91f65b0a449cad136 Reviewed-by: hjk <hjk@qt.io>
* | Adapt to mainstream changesJarek Kobus2022-01-261-4/+4
| | | | | | | | | | Change-Id: I9e013c433e97e218fd402b0f08d62334f52fb3c1 Reviewed-by: hjk <hjk@qt.io>
* | Fix compileChristian Stenger2022-01-241-1/+1
| | | | | | | | | | | | | | Amends eb77287d97bc. Change-Id: I5568675d8d76db3f2b8429cfe78c234ddadbb695 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Adapt to upstream changesChristian Stenger2022-01-201-4/+4
|/ | | | | Change-Id: Ie21f7298ee0fcfa7ecba55d47dcda1ce58d1eb81 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Adapt to upstream changeChristian Stenger2021-09-151-0/+1
| | | | | Change-Id: Icb812d79aeb81d02729836d20e69c7af4c16a891 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/5.0'Eike Ziller2021-08-181-0/+2
|\ | | | | | | Change-Id: I1e435d12660d2da81f7d5a2fd9e5f5c11d74d3b7
| * Add .user files and build directories to gitignoreEike Ziller2021-08-181-0/+2
| | | | | | | | | | Change-Id: I371e4d52a4d56c273c14c61a09c4f8690fd37400 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Add simple wizard for creating a Haskell source/module fileEike Ziller2021-08-184-0/+54
| | | | | | | | | | Change-Id: Ieae69f981747af4fbf36919abc9604d8e190f207 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/5.0'Eike Ziller2021-08-182-24/+15
|\| | | | | | | Change-Id: Ide9af7da90b7ce2782983a6cb0e5865f038b2212
| * Fix initial build directory used in build stepEike Ziller2021-08-172-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | In the BuildStep constructor the build configuration is not fully set up, leading to an empty build directory in there. It is not needed that we update the command directly on changes though (it is not visible in the projects mode UI anywhere), so just initialize the build step in its init() method. Change-Id: Iab168d15f1224c2e1ca66017244a80ed1059f417 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Adapt to upstream changesChristian Stenger2021-08-171-10/+10
| | | | | | | | | | Change-Id: I24041857f529e813579a7f9740d425fc03d289bc Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Adapt to upstream changesChristian Stenger2021-08-092-3/+3
| | | | | | | | | | Change-Id: Iab7617d66d5eada96d6e7add7a927695390c8668 Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/5.0'Eike Ziller2021-08-046-25/+33
|\| | | | | | | Change-Id: I97a57840bd79bf031f2e5c2265982508f57d28ea
| * GitHub: Update Qt Creator, cmake & ninja, adapt build_plugin.py locationv5.0.0-rc1Eike Ziller2021-08-041-10/+18
| | | | | | | | | | Change-Id: Id05426636de069d6caf2b5e7cc1b0ae0cab6c418 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Fix build with Qt 6Eike Ziller2021-08-044-14/+14
| | | | | | | | | | | | | | | | | | - setContentsMargins - QStringView instead of QStringRef Change-Id: I2cd4df9b68f5f2fbf4c5d918b0bf238734518037 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Adapt to upstream changeChristian Stenger2021-06-251-1/+1
|/ | | | | Change-Id: I2c8179fed848a9ff078afb24be6e2a9d522a15b9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Adapt to upstream CommandLine movehjk2021-05-141-0/+1
| | | | | Change-Id: Ia2285b402bb18b4f392d437a762ba2bc7896628c Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.15'Eike Ziller2021-03-182-3/+3
|\ | | | | | | Change-Id: Icee22c01e5fc48638111312152cc6b65cebfe31d
| * Adapt to upstream changesEike Ziller2021-03-162-3/+3
|/ | | | | | | PathChooser::setFileName was removed/replaced by setFilePath Change-Id: I3fbf675c9c15248629bab5ebeb3311dd62526b03 Reviewed-by: hjk <hjk@qt.io>
* Update github workflow to 4.15.0-beta1 snapshotsv4.15.0-beta1Eike Ziller2021-02-081-2/+2
| | | | | Change-Id: I28c6e5a10435c6643579b29ac2f5ec59f22013bf Reviewed-by: Eike Ziller <eike.ziller@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 17:37:20 +0000