summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Github: Build with 4.15.0 release4.15Eike Ziller2021-06-091-1/+1
| | | | | Change-Id: Ia231b7de189306049d0dfad0d08d91cd8b5709cc Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* GitHub: Fix location of build_plugin.pyv4.15.0Eike Ziller2021-04-151-1/+7
| | | | | | | With the fix of the devel package, this has moved. Change-Id: If4635a205058198f8ce2ee8ac3debe3d97334dde Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* GitHub: Build against 4.15.0Eike Ziller2021-04-141-1/+1
| | | | | Change-Id: I53580bee23d6ab669e20986e7c9d901cd4100bef Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* GitHub: Build against 4.15 rc1v4.15.0-rc1Eike Ziller2021-03-261-1/+1
| | | | | Change-Id: I0cd7aabf7cfcf62d516cf5a7e3ec9faa1bc0cd64 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* GitHub: Build with 4.15 beta2v4.15.0-beta2Eike Ziller2021-03-251-1/+1
| | | | | Change-Id: Ia94952f4d2ebc102c9ea90cbfe21ade7c01acf3e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* 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>
* Adapt to upstream changesOrgad Shaneh2020-02-063-5/+5
| | | | | Change-Id: Ib8884f1d62129d8275f4036bfd8880137733217c Reviewed-by: hjk <hjk@qt.io>
* Fix crash on startupOrgad Shaneh2020-01-313-6/+8
| | | | | | | FossilPluginPrivate::instance() was called before dd was assigned. Change-Id: Id6bb6a0134ffa80e18c9c9cc144fb25ca6a2be6b Reviewed-by: hjk <hjk@qt.io>
* Fix CMake and Qbs buildEike Ziller2020-01-312-2/+0
| | | | | Change-Id: I7642edb86c8302883f4e163172a0e5f3ad3de417 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Use default constructed QFlagshjk2020-01-312-2/+2
| | | | | | | Recent Qt versions complain about the nullptr constructor. Change-Id: I4c670c3f6e4c3e7080305f5b0dd4639f070af66e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Adapt to upstream changesOrgad Shaneh2020-01-3111-433/+318
| | | | | Change-Id: I3c55a84419b22d02bf275729220572c10ca11e35 Reviewed-by: hjk <hjk@qt.io>
* Adapt to upstream changesOrgad Shaneh2020-01-318-129/+147
| | | | | Change-Id: Ibdbd3abcfd65b091744451830625e2135c6573d9 Reviewed-by: hjk <hjk@qt.io>
* Adapt to upstream changesEike Ziller2019-12-192-5/+4
| | | | | Change-Id: I105277aba8e7d897ed65f8bba4cd803091046212 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-10-232-5/+5
|\ | | | | | | Change-Id: I43583fd865da17133d04b939696618ab09e29da6
| * Adapt to changes in 4.114.11Eike Ziller2019-10-232-5/+5
|/ | | | | Change-Id: Ie02d61ecdb1a636ca4d21b1e5b09bde530c1fdca Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-08-272-0/+37
|\ | | | | | | Change-Id: I42a056f1803fc78f0c9fa917e825455cbc48a1f8
| * Add cmake build files4.10Eike Ziller2019-08-192-0/+37
|/ | | | | | Change-Id: I07353d37163807b9799d8336a9294a2bb99eaf6c Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Adapt to upstream FileName changesEike Ziller2019-05-295-20/+20
| | | | | | Change-Id: I5b2a3ec17024fdc569df0c65f8d48564d5a3afea Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* FossilClient: De-noiseOrgad Shaneh2019-05-151-43/+45
| | | | | Change-Id: I9129d1e542073c2454ed1758af1b8dfc06ba0e1a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Adapt to masterOrgad Shaneh2019-05-142-2/+3
| | | | | Change-Id: Ie1b9f937fe2daaaa2a181d28aec8ba065aff9e3f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.9'Orgad Shaneh2019-05-134-8/+9
|\ | | | | | | Change-Id: I830c83b248b541cf4bd1a20f4cb0852b1174e0df
| * Adapt to 4.94.9Eike Ziller2019-05-133-7/+8
| | | | | | | | | | Change-Id: I9c413eaf6d70eaf09640aed349c876c040ef55ba Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * Doc: Fix dependency to Qt CreatorTopi Reinio2019-02-131-1/+1
|/ | | | | | | | | As Qt Creator now uses $IDE_DISPLAY_NAME as the doc project name, it expands to 'Qt Creator'. QDoc then constructs the index file name as 'qt-creator', hyphenating the space. Change-Id: Ib818fc1a94b1e65bc568f2552eb721a634e68d7e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 19:37:14 +0000