Commit Graph

47434 Commits

Author SHA1 Message Date
hjk
753c6812e2 Nim: Add a summary updater to NimbleBuildStep
Change-Id: I227b11ff90595b47568869b85f854350c5e90619
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-10 11:05:12 +00:00
hjk
da5852a3b3 ProjectExplorer: Remove ArgumentsAspect::argumentsChanged signal
The base Aspect::changed() is good enough.

Change-Id: Ib660e06cf4240198f7f73948ea0922a11568d4a2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-10 11:05:05 +00:00
hjk
ec75575e64 Nim: Rework NimbleTaskStep
Use StringAspects for m_taskArgs and m_taskName.

Change-Id: I69496029e3f414012c06e8217debfe2507d75cc6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-09 13:52:51 +00:00
Christian Kandeler
1e452f1ad3 QmakeProjectManager: Compare the right set of arguments
... when determining whether to re-run qmake.
We need to look at the effective arguments, not the user arguments.
Of course, the whole approach is still a shaky heuristic, but it should
be more correct now than it was before.

Fixes: QTCREATORBUG-24538
Change-Id: I763f8095becacde0f9549890161b8a47c6344b6b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-09 11:34:23 +00:00
Christian Stenger
24f35037d1 LanguageClient: Fix regular expression
The match has to be a full match to avoid always validating
the full file if located at a literal.
This fixes bad performance of language clients in big files.
Amends 119a3c1ce9.

Change-Id: I7153f3d7d7125715846de7626d215093feae2908
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-09 10:44:05 +00:00
Christian Kandeler
d7229d4afc ProjectExplorer: Fix restoring parent toolchain
... for auto-detected clang toolchains on Windows.
We must wait until toolchain loading has finished before determining
whether the parent toolchain still exists.

Change-Id: I4d9ed3e1d7df47dd4b2b408c70d796c8972c9a54
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-09 09:48:34 +00:00
hjk
bd31ba0e09 CMake: Slim down CMakeStep interface
Change-Id: Ia2cce411647e434a9edd7ef2b66a187bad6d8c12
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-09 09:18:52 +00:00
Christian Kandeler
90a18fe7fa ProjectExplorer: Fix ToolChain::isAutoDetected()
Amends d116559cd8.

Fixes: QTCREATORBUG-24545
Change-Id: I3a6c198a6ef2db91c4c3eb75721657e0c491e665
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-09 08:30:17 +00:00
hjk
4964d0bf81 CMake: Use StringAspect for cmake arguments
Change-Id: I18e9af5f630a2b0a11a427848368c9f980819717
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-09 06:50:17 +00:00
hjk
61bfd32438 ProjectExplorer: Introduce a ProjectConfiguration::kit() function
For convenience, and use it in some places.

Change-Id: I8f7cb502b37b2fbf4cf2d17cac9c6299558332dc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-09 06:27:21 +00:00
Eike Ziller
03db57f524 DiffEditor: Fix Qt6 build
QStringRef is gone. QStringView::split is not available until Qt6.
Since using a ref/view might actually have a performance impact in this
case, work around this with a typedef to the available type.

Task-number: QTCREATORBUG-24098
Change-Id: I72dcb4a9c93b73e396dfb9a2760af924db809eaf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-09-09 06:03:10 +00:00
Christian Kandeler
58e633a8a4 CppTools: De-duplicate list of include paths
It makes more sense to handle this centrally than in all the build
system plugins.

Fixes: QTCREATORBUG-24515
Change-Id: I1c0f815d44135bcfb76ce51c67b6494a50e1de48
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-08 15:52:22 +00:00
Christian Kandeler
e778283b08 ProjectExplorer: Filter out non-applicable toolchains
... when filling the "parent toolchain" combo box for clang on Windows.
We should not offer the user a mingw C compiler as the parent of a clang
C++ compiler. Even though it will probably work (as it's mainly there
for the sysroot), it's conceptually weird and it blows up the number of
entries for no good reason.

Change-Id: Ic920993b4ff36f8d8d095392555dc9d27f376878
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-08 14:04:13 +00:00
Christian Kandeler
570e452b18 ProjectExplorer: Fix ToolChainManager::isLoaded()
The presence of the accessor object does not indicate that the
toolchains have been restored, just that the restore process has
started.

Change-Id: I2ae3e3b091ebeab3ad4b401a1d8dcdb6a72e1408
Reviewed-by: hjk <hjk@qt.io>
2020-09-08 13:50:25 +00:00
Eike Ziller
d8c3487037 Help: Fix compilation with Qt6
Adapt to size type and QFont::weight() changes.

Task-number: QTCREATORBUG-24098
Change-Id: I580601433c9f81b7675b806d5eb2c55ee3060011
Reviewed-by: hjk <hjk@qt.io>
2020-09-08 13:45:53 +00:00
Miikka Heikkinen
92f9502f56 QmlDesigner: Fix image id generation for names starting with digit
Change-Id: I763e8b49d0b8dd3274bea79d61156321185706a5
Fixes: QDS-2759
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-08 12:59:20 +00:00
Christian Stenger
158ac2d339 Nim: Fix running when building with nimble
Change-Id: I62b2eebf408119a19f0e98958e3132c16c9c6aa5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-08 11:58:24 +00:00
hjk
79010891e1 Debugger: Drop clang and llvm revision from LLDB version number
They are mentioned as separate lines in the lldb --version output
for self-build lldb binaries.

Change-Id: Ib0d6e46874ad5b576ac20a6aeab823d51571c0f2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-08 10:59:05 +00:00
David Schulz
44271262d9 LanguageClient: Fix crash after server shutdown
Unconditionally reset the assist provider even to a null pointer

Change-Id: Ie8f87802ab26b4a686704b792adc726a50f98bab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-08 10:41:58 +00:00
David Schulz
9055cb9843 TextEditor: fix text prefix check
Change-Id: Ib4b2039fe126fd10e8a5cb8961ccec08c1d1ea7b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-08 10:25:24 +00:00
Leena Miettinen
2fa0e96f19 Welcome: Add links to Quick Tips in the Tutorials tab
Update the link to the Qt Creator introduction and remove some
links that are less relevant in the Qt Creator context.

Fixes: QTCREATORBUG-24603
Change-Id: Ieebf4b051f5a34db84ba4f35c250d67f71168a43
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-08 09:17:28 +00:00
Christian Kandeler
cba414d501 ProjectExplorer: Fix crash when setting up run control
Amends 215b284666.

Change-Id: I2d820113153fc1c3326de00f38a5d14d71a501c9
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-08 08:52:39 +00:00
Eike Ziller
7aa0b1ea6b TextEditor: Fix build with Qt6
Adapt to QStringRef and QAbstractItemView::viewOptions() removal

Task-number: QTCREATORBUG-24098
Change-Id: Ia2d446312f68bd60143796284d31f5bba56aa0ed
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-08 07:47:30 +00:00
David Schulz
5299eb5bec TextEditor: Fix clean whitespace action
This is a partial revert of: e7f784ca73

Fixes: QTCREATORBUG-24565
Change-Id: Iffa149e0f97c315355f211f6ae3856fad08f4f3d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-08 04:23:14 +00:00
Knud Dollereder
d64ebc0f8b Fix easing-curve-editor context menu for macOS
Change-Id: I99eac383dbd247e42392424712eed001e2750008
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-07 15:04:37 +00:00
Eike Ziller
b7fda95477 Core/fileutils: Do not use QTextStream::setCodec
Gone in Qt6. Write into a string buffer and bulk convert and write that
into the file with QTextCodec.

Task-number: QTCREATORBUG-24098
Change-Id: I266e90e166a22c8b34b2963458af1cc4f5d2df82
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-07 12:40:27 +00:00
Eike Ziller
8d09191d2d Core: Fix compilation issues with Qt 6
- qrand() is gone
- adapt to incompatible change to QVariant constructor with custom types
- QAbstractItemView::viewOptions() is gone

Change-Id: I931d963fc4370077d628740ed90ca36c4e9ba1d5
Reviewed-by: hjk <hjk@qt.io>
2020-09-07 11:59:10 +00:00
Eike Ziller
e223e2480a Core: Do not use QStringRef
It is gone in Qt6.
QXmlStreamReader changed return values from QStringRef to QStringView,
so use auto there.

Task-number: QTCREATORBUG-24098
Change-Id: I806f01c20574721bfaa4b100747ef0bba75874a0
Reviewed-by: hjk <hjk@qt.io>
2020-09-07 11:59:02 +00:00
The Qt Project
7721d5c29a Merge "Merge remote-tracking branch 'origin/4.13' into master" 2020-09-07 11:58:43 +00:00
Miikka Heikkinen
2387b56012 QmlDesigner: Don't set ALWAYS_SAVE_IN_CRUMBLEBAR when no changes in qml
Core::DocumentManager::saveModifiedDocument doesn't set the alwaysSave
flag if there is nothing to save, which led to undefined results as
the flag was left to uninitialized state.

Change-Id: I9417775241123b9e1bb3b57b6ced96bc555fb635
Fixes: QDS-2718
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-07 11:39:35 +00:00
Miikka Heikkinen
b7e660471f QmlDesigner: Fix typo in settings key
ALWAYS_SAFE_IN_CRUMBLEBAR -> ALWAYS_SAVE_IN_CRUMBLEBAR
AlwaysSafeInCrumbleBar -> AlwaysSaveInCrumbleBar

Change-Id: I939c5631301ea8edcac6f07bbc08af2994907117
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-07 11:38:13 +00:00
Eike Ziller
df97d40a0d Merge remote-tracking branch 'origin/4.13' into master
Change-Id: Iab93dc48b4a38fb4c698481bbf02a5a65e08206b
2020-09-07 13:19:38 +02:00
Christian Kandeler
b0cad9e9c7 OutputFormatter: Fix visual glitch
When inserting a line into an output window, we have to delay appending
the line feed character. Otherwise strange visual effects appear under
certain circumstances.
I have no idea why.

Fixes: QTCREATORBUG-24411
Change-Id: If8842ae4d9db36d514996b1f34dcca0432fafbfc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-07 08:35:15 +00:00
Orgad Shaneh
f73f11d8c6 Git: Highlight newly added keywords in interactive rebase editor
Change-Id: I571e9576fcb781fda4dc5ce2df8a6bbc3a8abf9e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-07 08:32:37 +00:00
Christian Kandeler
9c99aa223d ProjectExplorer: Delay task icon creation
Parsers can change the initial task type when accumulating output, and
then the original icon would no longer match.
To the user, the problem manifested itself by a missing error symbol in
the issues pane and a missing text marker in the editor.
Fix this by delaying creation of the icon until it is used.

Change-Id: I5349f21c6c0d9bc39a5000ceb33faf88ea62eeac
Reviewed-by: hjk <hjk@qt.io>
2020-09-07 07:33:45 +00:00
Alessandro Portale
a650997448 QtSupport: Add supportsMultipleQtAbis getter
Introduce bool QtSupport::supportsMultipleQtAbis().

Let AndroidQtVersion respond according to the QVersionNumber.

This allows to replace the version arithmetics in several
places with straight forward (and better findable) function calls.

Task-number: QTCREATORBUG-24471
Change-Id: Ib6e39fd6485a54e08ad66f84d4e2582989043419
Reviewed-by: hjk <hjk@qt.io>
2020-09-07 07:10:26 +00:00
David Schulz
568cd8066e QmlDesigner: Fix compile for CMake/qbs
amends 913dc6473d

Change-Id: I1337ca5016ca3111ef0b3d714b909b40cdb93ff3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-07 06:13:20 +00:00
Christian Kandeler
b74d620bf0 CppEditor: Fix crash with adjacent raw string literals
Our lexer is not good at handling newlines embedded in raw string
literals; basically, it sees every continuation line as a new string. So
if such a continuation is followed directly by a new raw string literal,
we have to take care to tell them apart properly. In particular, it can
happen that an end delimiter occurs before an opening delimiter.

Fixes: QTCREATORBUG-24577
Change-Id: I631d0617d85e91f49a25d309d53778da0170eb3b
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-04 13:51:55 +00:00
Christian Kandeler
3b415f5ebd Vcs: Add "bulk delete" feature to API
... and use it to improve the user experience when removing several files
at once from a project.

Fixes: QTCREATORBUG-24385
Change-Id: I8e8c39ee9dc0046f1715a5143a7649fab06e5ad8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-04 13:41:08 +00:00
Orgad Shaneh
e504d96934 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I8a2dca29595a0770f4162786b15a145f3f4133af
2020-09-04 16:11:12 +03:00
Christian Stenger
b7573a7400 QmakePM: Fix possible nullptr access
Amends fc1fc6a07a.

Change-Id: I0a77c3834fc8e68de2f2d3ab379256c7adc00260
Reviewed-by: hjk <hjk@qt.io>
2020-09-04 12:30:38 +00:00
Miikka Heikkinen
913dc6473d QmlDesigner: Choose target property when dragging image to material
When dragging an image to a Quick3D default or principled material,
pop up a dialog to choose the target texture property.

Change-Id: I8d97ef5bf7c5192c2651fcd8cf64a7f4a87c9847
Fixes: QDS-2326
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-04 11:58:15 +00:00
Miikka Heikkinen
e6343c296a QmlDesigner: Generate qml id from image file name
When dragging an image file to create a Image or Texture item,
base the id on the file name rather than setting it to generic name
based on type.

This includes cleanup of AbstractView::generateNewId to remove
redundant and unused code as well as an option to provide a fallback
id prefix.

Change-Id: I563f1760ffbace9c5c2145477ec8736836f36c45
Fixes: QDS-2328
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-04 11:48:27 +00:00
David Schulz
ef10f3b937 ClangTools: Add QuickFixes to the editor
Change-Id: I9862231f0aa8e8274e8529e57e80eac5ececded9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-04 10:14:39 +00:00
David Schulz
b55a313b3d TextEditor: make TextEditorWidget constructor explicit
Change-Id: I0b2e5b8c09706697efa4c2fbc3bc7483d02f68d3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-04 10:14:30 +00:00
David Schulz
dba4bff703 TextEditor: use Utils::FilePath as file member in AssistInterface
Change-Id: I3bf9b013b9350411f918efdb9d1a36a2c22bf972
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-04 10:14:21 +00:00
David Schulz
339db00f85 Core: replace QString with Utils::FilePath to get documents
Change-Id: I01777c227398be8bd3bf877c5429b84a75aa361b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-04 10:14:14 +00:00
David Schulz
e4dec0484c ClangTools: Remove useless member FixitsRefactoringFile::m_filePath
Change-Id: I686eddeea7c52096175c3b2fe1a519e8fbf2c876
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-04 10:14:02 +00:00
David Schulz
7bbbdeac52 ClangTools: use VFSoverlay if the clang tool supports it
check the help output of a clang tool whether virtual file
system overlay is supported. Prepares for the vfso support
of clazy-standalone.

Change-Id: I157c94de1dda41c83945c9bc8a4c2e132b2e6551
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-04 09:48:44 +00:00
Christian Kandeler
215b284666 ProjectExplorer: Properly set up the output formatter
... for the app output window.

Fixes: QTCREATORBUG-24560
Change-Id: I199d7b16f445db498027094792c6cf344d920a88
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-09-04 08:50:13 +00:00