summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GitHub: Create universal binaries on macOS7.0Eike Ziller2022-03-311-0/+5
| | | | | Change-Id: I52d6490826cf00ed0e7c18525150f717e89c9416 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* GitHub: Build with 7.0.0 releasev7.0.0Eike Ziller2022-03-231-4/+4
| | | | | Change-Id: I2c54c7d3edea2bf327928d99d7b57bd3ad186b4e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* GitHub: Build with Qt 6.2.3 against QtC 7 betav7.0.0-beta1Eike Ziller2022-02-101-7/+7
| | | | | Change-Id: Ibb3efca8aa29dc1e8a1d9ea7a9868b0480c42a92 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Merge remote-tracking branch 'origin/6.0' into 7.0Eike Ziller2022-02-082-15/+22
|\ | | | | | | Change-Id: I160768d755ab444e5bab868d72fc9f403ea63169
| * GitHub: Use checkout@v2v6.0.06.0Eike Ziller2022-01-271-1/+1
| | | | | | | | | | | | | | Fixes security concerns of v1 Change-Id: Ib62b3d51459d6e6d07bdacc63b9d2f7b4fcf584f 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: If36a5e7ca71f40ecb701b7fd3e66e7fe0bd1c47f Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Doc: Fix dependency to Qt CreatorTopi Reinio2021-11-251-1/+1
| | | | | | | | | | Change-Id: If7082978c204f8e5a84e40668b9aee26f0014668 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * GitHub: Build against Qt Creator 6 snapshot with Qt 6.2Eike Ziller2021-10-221-12/+19
| | | | | | | | | | Change-Id: I5505a76d2ccb480eed5acbb90c7992cbba6f739d Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Remove qmake build filesEike Ziller2022-01-264-66/+0
| | | | | | | | | | Change-Id: I88f7bf7b04429a2501ad34dea7663ee8dafba820 Reviewed-by: hjk <hjk@qt.io>
* | Adapt to upstream changeChristian Stenger2021-11-031-2/+1
|/ | | | | Change-Id: I382253de65d1accf9693348f361924eb58d0bed0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Adapt to upstream changeChristian Stenger2021-08-241-1/+1
| | | | | Change-Id: If64379f70be8b241be1d671a470c5da6f3febc10 Reviewed-by: hjk <hjk@qt.io>
* Adapt to upstream changesChristian Stenger2021-08-065-101/+94
| | | | | | | | * FilePathification * SynchronousProcess -> QtcProcess Change-Id: I973ff68585788c8742652f69a7c057e28aafbaf4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/5.0'Eike Ziller2021-08-041-10/+18
|\ | | | | | | Change-Id: Ic7e250a8075b810dffea4956154cfad515ba939d
| * GitHub: Update Qt Creator, cmake & ninja, adapt build_plugin.py locationv5.0.0-rc1Eike Ziller2021-08-041-10/+18
| | | | | | | | | | Change-Id: I7b53d18f1ac5192f641b890dc9788fc0e0e2c9a9 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Adapt to upstream findTopLevelForFile changehjk2021-07-303-10/+6
| | | | | | | | | | Change-Id: I699d524c7b9317ac74f3f2ca3027271923ab982b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Adapt to IVersionControl FilePath changeshjk2021-07-301-38/+40
|/ | | | | Change-Id: I26e95992b69d8b38f107234fd47e04f02eae8436 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Adapt to upstream changesChristian Stenger2021-05-211-1/+2
| | | | | Change-Id: Ib6b36e98229e0f14d07a10ac35f66ff1e7f6379a Reviewed-by: David Schulz <david.schulz@qt.io>
* Fossil: Adapt to Make SynchronousProcess results more directly accessiblehjk2021-05-171-55/+68
| | | | | Change-Id: Ifd5f79ba50e38fdec9e3f5c412210a95d53e8a96 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fossil: Drop unneeded QRegExp includehjk2021-05-111-1/+0
| | | | | Change-Id: I64347f1df5a85aa06372eb196e22948bba1d9e2c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fossil: Adapt to upstream SynchronousProcess changeshjk2021-05-101-1/+1
| | | | | Change-Id: Idb6a2063efab8dd4b1c024bac748369105fbd0c2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fossil: Revert some unintentional hunkhjk2021-03-291-1/+1
| | | | | | | Amends 36f3cf69. Change-Id: I4a8ea5f2353fb2feb88087af86fec6d0f7919974 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fossil: Aspectify settingshjk2021-03-2414-472/+226
| | | | | Change-Id: I090cf3c63cd705220abb09e5d58eef89e9b55147 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update github workflow to 4.15.0-beta1 snapshotsv4.15.0-beta1Eike Ziller2021-02-081-2/+2
| | | | | Change-Id: I1d5afcf21f2053aab15ae58ec08dd10a9e19a40c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.14'Eike Ziller2021-02-085-3/+363
|\ | | | | | | Change-Id: I1c9336f9529353e11259fe5e2550ff869a08f495
| * Update github workflow for latest Qt Creator releasev4.14.04.14Eike Ziller2021-01-041-3/+3
| | | | | | | | | | Change-Id: I90a2b170ceaf5028d4d8a3bad7d12daa454e6d1c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * CMake Build: Increase cmake minimum version to 3.10Eike Ziller2020-11-161-1/+1
| | | | | | | | | | | | | | This fixes problems with PCH and AUTOMOC with policy CMP0071 Change-Id: Id8f5e9c550267131853fe6851106cd106be20865 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Fix compilation with upstream changesEike Ziller2020-10-212-2/+7
| | | | | | | | | | Change-Id: Ic0b6731339b84005c8d13ffa09793c5786ab1038 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Update GitHub workflowEike Ziller2020-10-212-129/+111
| | | | | | | | | | | | | | | | | | Provision cmake & ninja, use CMake for building and include various fixes from Qt Creator's main workflow. Build against 4.14 beta1 snapshots. Change-Id: Ic5d0df3ac4c4998fe417f74c984f868323168e5f Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Merge remote-tracking branch 'origin/4.13' into 4.14Eike Ziller2020-10-092-0/+373
|/| | | | | | | Change-Id: I8173b320e80cba6fc80ec05f0d2aedd251b6f38c
| * Add github actionv4.13.04.13Eike Ziller2020-09-152-0/+373
| | | | | | | | | | | | Change-Id: I967902da99a09ce760fb38a6ac834c734170a1be Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Do not include Core::IdEike Ziller2020-09-222-3/+2
| | | | | | | | | | | | | | It moved to Utils. Change-Id: I8bfbda0857e79577d02d4a9bad518f46769a8c07 Reviewed-by: hjk <hjk@qt.io>
* | Use C++17 like upstream Qt CreatorEike Ziller2020-09-211-1/+1
| | | | | | | | | | Change-Id: Iba5013a8bf50f18037dc0bf0853b1a21017f1da7 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.13'Orgad Shaneh2020-07-190-0/+0
|\| | | | | | | Change-Id: Iad98591f8df2a260a672ea119119140b12d197ee
| * Work around MSVC error initializing QString from const char *Artur Shepilko2020-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This deals with the error while compiling with MSVC 2017: fossilclient.cpp(398): error C2440: 'initializing': cannot convert from 'const char *' to 'QString' fossilclient.cpp(398): note: No constructor could take the source type, or constructor overload resolution was ambiguous No problem building that with gcc. Change-Id: Iddb9754cd5010505b182ca9b81e390a7c3b8fdda Reviewed-by: Orgad Shaneh <orgads@gmail.com> (cherry picked from commit a0f4ce71e81dcf40e6c4c04f0fd87749ae71fd42)
* | Merge remote-tracking branch 'origin/4.13'Orgad Shaneh2020-07-190-0/+0
|\| | | | | | | Change-Id: I4a9a18d25990aad9a49160768b449f0a649e6d9f
| * Use Utils::SkipEmptyParts instead of the deprecated one in QStringArtur Shepilko2020-07-194-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | - Qt 5.14 introduced Qt::Keep/SkipEmptyParts and deprecated these in QString namespace. - Qt Creator defined Utils::SkipEmptyParts conditional on the Qt version, so we use that for flexibility. - Remove any explicit references to QString::KeepEmptyParts, as it's a default value. Change-Id: I72c65e4901ebc4c5422d4835e63fe23fb6ef28ff Reviewed-by: Orgad Shaneh <orgads@gmail.com> (cherry picked from commit 1e3721c8742171ba0a34dfe36636d24fe69fbd5b)
* | Use Utils::SkipEmptyParts instead of the deprecated one in QStringArtur Shepilko2020-07-194-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | - Qt 5.14 introduced Qt::Keep/SkipEmptyParts and deprecated these in QString namespace. - Qt Creator defined Utils::SkipEmptyParts conditional on the Qt version, so we use that for flexibility. - Remove any explicit references to QString::KeepEmptyParts, as it's a default value. Change-Id: I72c65e4901ebc4c5422d4835e63fe23fb6ef28ff Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/4.13'Orgad Shaneh2020-07-174-11/+11
|\| | | | | | | Change-Id: I87977120608b94bd2576b2217337c02fe34e4ceb
| * Fix build after upstream changeEike Ziller2020-07-074-11/+11
| | | | | | | | | | | | | | | | Use Utils::Id. The upstream files no longer automatically include the Core::Id wrapper. Change-Id: I7b4d6ef865df44b47e07248bb653a913ba68c494 Reviewed-by: hjk <hjk@qt.io>
* | Work around MSVC error initializing QString from const char *Artur Shepilko2020-07-161-1/+1
|/ | | | | | | | | | | | This deals with the error while compiling with MSVC 2017: fossilclient.cpp(398): error C2440: 'initializing': cannot convert from 'const char *' to 'QString' fossilclient.cpp(398): note: No constructor could take the source type, or constructor overload resolution was ambiguous No problem building that with gcc. Change-Id: Iddb9754cd5010505b182ca9b81e390a7c3b8fdda Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Adapt to upstream changeEike Ziller2020-06-221-1/+0
| | | | | | | Id moved from Core to Utils. Remove unused and now wrong forward declaration. Change-Id: I6742a6df3e4d6e1babbb774259d815e50c78a9e1 Reviewed-by: hjk <hjk@qt.io>
* Adapt to upstream changesOrgad Shaneh2020-06-181-7/+6
| | | | | Change-Id: I964746d7c34cdf6a23cb027cbf6987b21a6b079f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Adapt to Fossil client version 2.12Artur Shepilko2020-06-172-5/+11
| | | | | | | | | | Fossil 2.12 changes the output of 'info' command replacing the label that attributes the check-out's hash-id from 'uuid' to 'hash' [1]. [1]: https://fossil-scm.org/fossil/info/8ad5e4690854a81 "src/info.c" Change-Id: I1277d784c377ee37434abc017db748d16353b31e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Push/pull: Fix the handling of the Default URLArtur Shepilko2020-06-162-48/+53
| | | | | | | | | | | | | | | | | On a successful push/pull operation, Fossil allows user to save the used remote URL, such that the next time it would be used by default. With Fossil plugin, the user is allowed to choose the saved Default location, also it's pre-filled in Remote URL field. A choice is offered to save the newly entered Remote URL, otherwise the entered URL is used only once without saving. To use the Default URL, Fossil push/pull command should be called without specifying any URL explicitly. Otherwise, Fossil client displays a prompt asking whether to save it, even when it matches the currently stored one. Change-Id: I3f517be4b60bef5bf1f5bca19345078ef6d6dda2 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Import wizard: Fix the auto pre-fill of the 'Local clone' nameArtur Shepilko2020-06-161-2/+2
| | | | | Change-Id: I5460c2a02b5be7e69600cb424ed168f969e2ca05 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-054-58/+20
|\ | | | | | | Change-Id: I0cdc8a62b64666059e89b6b166800298b5467b2f
| * Adapt to 4.124.12Orgad Shaneh2020-02-211-8/+2
| | | | | | | | | | Change-Id: Ibef89fafaa5a0ae89d2653219217c617cd918839 Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * Adapt to upstream changesOrgad Shaneh2020-02-202-37/+4
| | | | | | | | | | Change-Id: Icc1f048523381e949a7eb824e373af6d4c3ceba3 Reviewed-by: hjk <hjk@qt.io>
| * Adapt to 4.12Orgad Shaneh2020-02-142-15/+16
|/ | | | | Change-Id: Ie49d91582dac4b130c8fcd7db2ce19249ed3f057 Reviewed-by: hjk <hjk@qt.io>
* Adapt to recent VCS base changeshjk2020-02-105-220/+233
| | | | | Change-Id: Ia55808cb0e0959ab77333120dabd5401ec51d2a3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 00:02:33 +0000