Commit Graph

64660 Commits

Author SHA1 Message Date
hjk
a6fe2efd4e Bazaar: Replace QRegExp
Task-number: QTCREATORBUG-24098
Change-Id: I450d5756359596495f501759670970c9c541d4d9
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
2020-06-24 05:47:26 +00:00
hjk
f7242cdce9 Debugger: Some compilation with Qt 6
Change-Id: Ifffe68a3c902bbad026919171ac906ae05ec86f2
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-24 05:43:51 +00:00
Artur Shepilko
5be581ddd0 LSP: Fix a compiler warning about signed/unsigned comparison
Change-Id: Id7a7e2372fb968fab077a97e5f7660c1bd52dd20
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 17:26:08 +00:00
Artur Shepilko
3fddc4c475 Debugger: Fix a compiler warning about uninitialized variable use
Change-Id: I9e2ce85b3754bf7c832a8ca32412a2c9900344ef
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 16:31:39 +00:00
Christian Kandeler
fc53bae328 Fix the cmake/RemoteLinux combination
This broke in c2127c9ec4.

Task-number: QTCREATORBUG-21235
Change-Id: I732ce3ad46370141f62fc80792073f5a8ad2f234
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 15:52:56 +00:00
hjk
37a28c1726 Git: Compile with Qt 6
Change-Id: I64d6cbb8fc65ba63a2cdb26246ff0efd29f864b7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-23 14:53:08 +00:00
Christian Kandeler
6791ddb27c ProParser: Fix build with MSVC
Strangely, MSVC requires operator< for values of std::list.

Change-Id: I5f62348a69d9b25585798b7824c6538d4cb5df7c
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 14:29:53 +00:00
Eike Ziller
028c0b1cdd Plugin install: Fix crash on cancel
When the process is aborted, both errorOccurred and then finished is
sent. Because of the combination of deleteLater and QueuedConnection
this leads to m_process being already nullptr when finished is sent, so
add some guards.

Change-Id: I446114176f8fa5934b411b39d77c97d6267303fa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-23 13:48:02 +00:00
hjk
611a3bb68a Even more Qt6 porting
Task-number: QTCREATORBUG-24098
Change-Id: Ib6ef0e521483153c9716c9a1870072e836d6b026
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 11:24:44 +00:00
Leena Miettinen
389bcd935b Doc: Describe the Install Plugin wizard
Fixes: QTCREATORBUG-24231
Change-Id: I40f1205f37b6ee3a90460d744fdc8bd3ac0387d0
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 11:19:11 +00:00
Christian Kandeler
a204fa65c8 CppEditor: Do not underline leading whitespace
... when visualizing the range of a code model warning.
Otherwise, warnings covering multiple lines can get too noisy.

Fixes: QTCREATORBUG-18659
Change-Id: Ieff7729d8069e791027f7bdde5fca13f4c7f7163
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-23 11:01:12 +00:00
Leena Miettinen
e4402e229f Doc: Describe options to automatically fix indentation
Change-Id: Ic0b71c382716bcd267027ccc94c942ba017fe426
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-23 10:41:15 +00:00
Christian Kandeler
e1c4fcaab5 Toolchains: Fix auto-detection for clang-cl
This broke in aef8255ba0, which removed the collection of MSVC
toolchains in a global variable for clang-cl to inspect.

Change-Id: I949aa0a098ed307d264e8fe23625586018507d00
Reviewed-by: hjk <hjk@qt.io>
2020-06-23 09:21:13 +00:00
hjk
59ddc75b59 ProParser: Drop use of QLinkedList
Effectively 7cba2acd2cc and 0d88721d772 from qtbase.

Task-number: QTCREATORBUG-24098
Change-Id: I88902b358d88e34032f588b9eb0af13c5b9d8675
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-23 09:07:49 +00:00
hjk
fd2236a59a More Qt 6 fixes
Task-number: QTCREATORBUG-24098
Change-Id: I1e30b49218b18f426aea6e4cd3680be513894746
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 07:59:46 +00:00
hjk
f194b92d0a README.md: Re-use description bits from the manual
Change-Id: I880ddcd3aa6173120aed7a64ee8635b29b9f37df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 07:53:04 +00:00
hjk
6027c62ab2 FakeVim: Finish port to QRegularExpression
Change-Id: Id4eaab8f41be3b724ddf22f74384a60995cf4aa5
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 07:52:37 +00:00
hjk
86b7e287d6 FakeVim: Port more from QRegExp to QRegularExpression
QRegExp will not be available in Qt 6.

Task-number: QTCREATORBUG-24098
Change-Id: Ia1aec515615ecaf8e92ae1a3a1dad92cb999bfb1
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 07:33:48 +00:00
Leena Miettinen
c7cde7126f Doc: Describe adding multiple keyboard shortcuts for a function
Task-number: QTCREATORBUG-72
Change-Id: I528a77594af1429e92cd65db8c6b4de1eea0126c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-23 06:27:50 +00:00
hjk
c30eab99e3 Debugger: Port cdbengine to QRegularExpression
Change-Id: Ib957e2696b5bc791ecc0e35676edaf8d0a2467a4
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-23 05:53:21 +00:00
Volodymyr Zibarov
40173ad4ab C++: Fix auto variable resolving for template class constructor call
Code snippet:
template<class T> struct MyStruct { int value; };
int main() {
    auto s = MyStruct<int>();
    s.value;  // "value" is not found
}

This fixes find usages for unique_ptr declared as auto like this:
auto ptr = std::unique_ptr<MyStruct>(new MyStruct());
ptr->value;

Also fixes in-place constructors:
std::unique_ptr<MyStruct>(new MyStruct())->value;

Fixes: QTCREATORBUG-15364
Change-Id: I8d452a77fe85e63665ec8d4c4afbcf8aad063121
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-22 14:27:49 +00:00
Assam Boudjelthia
a927c320f7 Android: fix sdkmanager detached from AndroidSettingsWidget
This was caused by 7419e09d0f.

Change-Id: I423047d353698798c712f9a32603e955ae1ee15c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-06-22 14:12:17 +00:00
hjk
ee5633dac4 Nim: Initialize NimbleBuildConfiguration::m_buildType
Coverty complains.

Change-Id: I22497e926c32619afac375a7112bb9b62e74a303
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 12:27:06 +00:00
Eike Ziller
ba5b1fc8ab Fix filtering in various hierarchical views
The intermediate "category" nodes where never filtered out.

CategorySortFilterModel was changed to use filterRegularExpression() and
setFilterFixedString does not set that (it only affects filterRegExp()
which we need to get rid off).
Set a regular expression directly instead of a fixed string.

Amends 47e576528e

Change-Id: I6f844027b83d66ca2d5088d83e6e84b01b9eda45
Reviewed-by: hjk <hjk@qt.io>
2020-06-22 12:23:12 +00:00
Eike Ziller
f568648768 Fix .gitignore
Do not ignore _any_ directory starting with "build", just a toplevel one
(which possibly is a CMake build directory).

Amends bd4c9ea250

Change-Id: I1f80db1241e51c4d49d94593cbcaf881c8659cb5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-22 11:53:20 +00:00
Thomas Hartmann
6112b39dcc QmlDesigner: Use font folder for fonts
We should use the fonts folder as default if it exists.

Change-Id: If18714ffa195856f14d7960b46b20992b48faa6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-22 10:32:41 +00:00
hjk
dd9656cf84 Beautifier: Fix freeze in extensionsInitialized
Amends c9a7a3a2d3.

Change-Id: Id14412a584c20e3e14b5c377857af43622ccf65d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 10:12:32 +00:00
hjk
8836cdb75a Core: Drop use of QApplication::globalStrut()
Not in Qt 6, and I don't see a difference.

Change-Id: I4556e48f9ab60b4024ca46a7ed1389b54744c891
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-06-22 09:30:20 +00:00
Christian Stenger
d47f8eaff2 TextEditor: Utils: Do not use invalid regular expressions
Having a search inside a document and switching the find options
to use regular expressions may end up in lots of warnings
regarding using an invalid expression for a match call.
Check beforehand to avoid this.

Change-Id: Ia929090ae3910ff3fa87b57a5718293d2b6ccd04
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-22 09:19:59 +00:00
Eike Ziller
4a8b3268dd Merge remote-tracking branch 'origin/4.12'
Change-Id: I0935f0087efc1ddd4f17fcafc2e3b5c58c23bef4
2020-06-22 09:33:40 +02:00
Alessandro Portale
3eaf52256a Icons cleanup: Remove unused icons and deduplicate identical pngs
Accordingly Adjust the svg element Ids to new png locations in the
source tree.

Change-Id: I717dd7165c571e69322a1cce8d609f49c6bc75bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 07:12:07 +00:00
hjk
736e6eada0 Various Qt6 compile fixes
Task-number: QTCREATORBUG-24098
Change-Id: Ia0fe92d82d4477bd8f14ee25754b114316fc878a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 07:04:12 +00:00
hjk
e6d1f08642 Drop use of Qt::DefaultLocaleShortDate
Gone in Qt 6.

Task-number: QTCREATORBUG-24098
Change-Id: Ie9fe1858406133fed6987de0e0a38fe86de15caf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 06:43:39 +00:00
hjk
467fdead9f Core: Remove IFileWizardExtension::allFileWizardExtensions() declaration
Unimplemented and unused.

Change-Id: Id9df5819bea419a0109717f9afa616854996826c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-22 06:41:46 +00:00
hjk
6896ca3a26 Utils: Introduce a central porting.h for "simple porting stuff"
I figured it might be easier to keep track of active hack here and
also recognized includes that only exist for that reasons in user code
if it's always the same.

Change-Id: I4bf6af493443148cf30a6903d541cd9dc58946da
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-22 06:30:03 +00:00
Leena Miettinen
71129c9aaa Doc: Describe missing steps in flow view docs
Also describe applying states in flow views.

Change-Id: Icda4559c95f9319845d6c413b33ad5e4016fad5e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-22 06:26:31 +00:00
hjk
3b40809d1c LSP: More Qt 6
Change-Id: I3c4b907c4bc5ee96f4716b03ec238a03704d56a1
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-22 05:01:16 +00:00
David Schulz
e323529b3c LSP: Compress document change notifications
Change-Id: Iaf6cb99784f4e1ed1291ace1f4cc18cf6af88672
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-22 04:23:06 +00:00
Orgad Shaneh
92a4c0d38a VCS: Pass links to the correct VCS
Current implementation requires each VCS to connect to the referenceClicked
signal. Only Git does it, but this is conceptually wrong. If other VCSs
would connect to the same signal, all of them will act upon clicking a
link, which can result in multiple editors, most of them are likely to be
invalid anyway.

By default executes vcsDescribe. Can be extended or modified by subclasses.

Change-Id: Ib953009efd77446a4b2963f0aa8a2f3f3d26509f
Reviewed-by: Artur Shepilko <artur.shepilko@nomadbyte.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-06-21 06:47:20 +00:00
Christian Kandeler
cb0b8556c8 ClangTools: Fix qbs build
Amends 6e798401a0.

Change-Id: I3e2225ec9e6145594479c8f7dfdd09f867d7ad02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-19 14:51:09 +00:00
hjk
b7862ae453 LSP: Fix and simplify log size restriction logic
Do not subtract from unsigned (size) values.
Amends d15d15efa2.

Change-Id: I9a8b09d3733b49ea646ae8a14caefcf5c908fad3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-19 14:03:03 +00:00
Nikolai Kosjar
8cb74f88f9 ClangTools: Use resource dir from tool instead of hard-coded one
This makes it more likely that using other clang-tidy and clazy binaries
than the ones shipped with Qt Creator will work.

Done-with: Nikolai Kosjar
Fixes: QTCREATORBUG-23672
Change-Id: I8c44e037ca8d50505fe10032034edaf4f408d52c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-19 13:11:53 +00:00
Christian Stenger
119a3c1ce9 LanguageClient: Replace QRegexp by QRegularExpression
Task-number: QTCREATORBUG-24098
Change-Id: Ic8259ded3f721957bd04aa00146b20bd90b41dcd
Reviewed-by: hjk <hjk@qt.io>
2020-06-19 12:48:54 +00:00
Christian Stenger
e817100b9c Utils: Replace some QRegExp to QRegularExpression
Task-number: QTCREATORBUG-24098
Change-Id: I7d12992506bbe33306c0ab750f73c7db1626abc3
Reviewed-by: hjk <hjk@qt.io>
2020-06-19 12:30:01 +00:00
Christian Stenger
f9be969c10 Utils: Replace QRegExp by QRegularExpression
..inside the template engine.

Task-number: QTCREATORBUG-24098
Change-Id: I9a1190eda4e57d36f8be750604796849ed672537
Reviewed-by: hjk <hjk@qt.io>
2020-06-19 12:29:36 +00:00
Christian Stenger
f82b96107f Qnx: Replace QRegExp by QRegularExpression
Task-number: QTCREATORBUG-24098
Change-Id: Ic32313d8879b6497209196b0e3e4846c00c9846a
Reviewed-by: hjk <hjk@qt.io>
2020-06-19 12:29:06 +00:00
Christian Stenger
788926d624 QmlProjectManager: Replace QRegExp by QRegularExpression
While at it modernize a bit.

Task-number: QTCREATORBUG-24098
Change-Id: I5787466333e40e6e9bd3d9c77dc6267fffb970f8
Reviewed-by: hjk <hjk@qt.io>
2020-06-19 12:28:48 +00:00
Christian Stenger
26a9f4a214 SCXMLEditor: Remove unused includes
Change-Id: Ia2d76b0f7749686636589bde9c4bcbd9b52f39d4
Reviewed-by: hjk <hjk@qt.io>
2020-06-19 12:28:34 +00:00
hjk
c9a7a3a2d3 Beautifier: Remove inner namespace level
And inline non-shared object id.

I regularly stumble over this speciality when doing mass refactorings
in the code base and I believe the extra benefit this namespace level
has does not outweigh it.

Change-Id: I3694a656f1095dcb5509b212b9e1d25ae5c8b5ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-19 11:42:10 +00:00
Eike Ziller
e064100007 CMake build: Set LSMinimumSystemVersion on macOS
Setting it to CMAKE_OSX_DEPLOYMENT_TARGET if that is set
(either via cmake directly, or, as we do for the packages,
by setting the MACOSX_DEPLOYMENT_TARGET environment variable).

Fixes: QTCREATORBUG-22466
Change-Id: I7378bc32be6d66cf4e4b1eac1530c89159e74804
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-19 11:22:05 +00:00