Commit Graph

62421 Commits

Author SHA1 Message Date
Thomas Hartmann
20017769c4 QmlProject: Improve warning message
Change-Id: I0b8aaa8dcb6926c9a23c297fa13a7ec4eda0089b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-11-15 13:28:34 +00:00
Eike Ziller
ff5bfe6f0f Merge remote-tracking branch 'origin/6.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I366a1a0e378811dfc9b4e6f42ec96426dbb15356
2021-11-15 13:14:24 +01:00
Jarek Kobus
90972ad822 Fix a crash on shutdown inside CallgrindTool
This is a quick fix for 6.0 branch.

Fixes: QTCREATORBUG-26563
Change-Id: Ida0f99a90c2e8515a2ea2b89de7a666f3067f908
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-15 11:09:54 +00:00
Henning Gruendl
87c8f4890e QmlDesigner: Update translation icons
* Fix characters U+009c and U+00ad not working by skipping those

Change-Id: I7c156184c1bd2ca6116d1bbdf8f0a61382340ce2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2021-11-15 10:28:39 +00:00
Christiaan Janssen
983ca3106d McuSupport: avoid double-space strings in warnings
Change-Id: Ia40412154662ce9a22ae569c9f8abf31b419cbce
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-15 10:23:17 +00:00
Thomas Hartmann
39738dee77 QmlJS: Add error message for Component with multiple children
Component is only allowed to have a single child element, that will
be the root element of the component.

If there is no child at all we create a warning. Having no child is
temporarily required.

Change-Id: I5c0d9d9cdf1be106b20ed4f1134a973d58126498
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-12 20:04:19 +00:00
Christian Kandeler
76d3ffa57a ClangCodeModel: Clean file paths resulting from "follow symbol"
Apparently, libclang can give us non-cleaned paths, which we never
noticed until ea215d612d.
We also restore the previous behavior of TextDocument::setFilePath() in
order to prevent similar regressions elsewhere.

Fixes: QTCREATORBUG-26561
Change-Id: I218ed29600e9fb6b299aa2ba0b9d1464f475c06b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-12 14:38:25 +00:00
Christian Kandeler
95e8afabba ClangCodeModel: Handle UI header updates with clangd
We need to manually refresh the documents that include the generated
header, as clangd does not know about it.

Change-Id: I8c4303ac029bbb56c01aa99b7950dcc651701678
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-12 14:37:51 +00:00
Thomas Hartmann
eab7a82301 StudioWelcome: Ensure only wizards with the QtSudio feature are shown
This is is easiest way to hide all unrelated wizards and
we do not have to maintain any list.

Change-Id: Id3f3b710b670cbe4e670d9dd86526daecab3fa9b
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-12 13:23:04 +00:00
hjk
b5e935948a BareMetal: Use more FilePath in OpenOcdGdbServerProvider
Change-Id: Ie3eee9aa6765e2fb3d634ee7a6309edcf6ef9e1f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-12 12:19:23 +00:00
Christian Kandeler
2c1adffb11 CppEditor: Fix renaming etc in non-project sources
Was probably broken in 33108795d6.

Change-Id: I54e2a668c00b132e3a7757be9e5ab294427f1f6d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-12 12:00:11 +00:00
Christian Kandeler
1dfc996652 ProjectExplorer: Give build-related errors higher priority
... in the issues pane.

Fixes: QTCREATORBUG-23655
Change-Id: Id9dc2c3781d69e0d70b12bb9fe39ced85b3f2084
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-12 11:59:03 +00:00
hjk
66900b1deb Autotest: Simplify ITestConfiguration::executableFilePath()
Change-Id: I7a3cdcc896b073a5cc24d00487902f4baff8719c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-12 11:08:18 +00:00
Tapani Mattila
d325db3eb2 CMake generating: Modify to generate files according to new dir structure
Task-number: QDS-5380
Change-Id: Ic3a4d6f4cd05185ded31b5d40adef43ff6508407
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-12 10:21:56 +00:00
hjk
3fd1122759 Utils: Rename FilePath::deviceLocalPath() to nativePath()
Change-Id: Id2b2b7d54a536d569c6dc717365ee28421e2b56b
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-12 09:02:45 +00:00
hjk
40c04a4fe4 Utils: Pass unhandled FancyLineEdit key events
... to direct base class CompletingLineEdit, so CursorDown
gets properly handled.

Change-Id: I8d8d9ec911527d5862dd1ba13691eaaf547f4230
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-12 09:02:18 +00:00
Christian Kandeler
4dd0537d4b ProjectExplorer: Point the user to the right source location
... when parsing gcc error messages with a "required from here" part.
It's typically buried deep within the output, but points to the actual
problem.

Change-Id: I06d778655d9e21edb7148f37f3921764e30353ee
Reviewed-by: hjk <hjk@qt.io>
2021-11-12 08:45:40 +00:00
Alessandro Portale
1e693bcc67 Android: Skip device list update no Android Kit is active
This adds workaround to reduce the load added by the update of the
Android device list, which currently happens in a polling style. Skip
an update if (*):
- The current open project is configured with a non-Android kit
- No project is open
- the current project target is null

To summarize the timeline of the timer used here:
- AndroidDeviceManager::setupDevicesWatcher() is called when Creator
is started or when settings are changed. The setup makes the connections
for the timeout and for AVD list future watcher. This will be done once.
If the timer is active it won't be done again, so no duplicate
connections.
- In the setup, the list of devices in updated once.
- On timer timeout, we attempt to update the list, however with
conditions listed in (*) as well as only when an Android adb path is
found.

Fixes: QTCREATORBUG-26547
Change-Id: I13312c4b507ce4e4064adb1c1342f4648f915394
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-11-11 22:31:46 +00:00
Thomas Hartmann
05122cc07d QmlProject: Do not allow to dismiss info bar for ui.qml files
If the info bar is dismissed ('Do Not Show Again') it will
never appear again. Since .ui.qml files are supposed to be opened in QDS
we do not want this to happen.

Task-number: QTCREATORBUG-26567
Change-Id: I236de493988c3634b56c0ac6b543f21f0bcfbec8
Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-11 18:48:33 +00:00
XutaxKamay
e88d049402 GenericProjectManager: Add support for pre-compiled headers
Users can now add the tag "pch" after a file path in the .files file, and
we will pass this information on to the code model.

[ChangeLog][plugins][genericprojectmanager]
Added support for precompiled headers in generic projects for
Clang Code Model.
In order to use it, inside <projectName>.files add the "pch" tag just
after the filename and the '|' separator, example:
... other files ...
src/pch.h|pch
... other files ...

Fixes: QTCREATORBUG-26532
Change-Id: Iffc9d49cfc0bf92eba56cfc08a3977b0be777131
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-11 16:44:41 +00:00
Tasuku Suzuki
162c68cb79 Change prev/next icons on toolbars to up/down arrows
Because issues, search results and others on output pane are listed vertically,
up/down arrows are better than left/right arrows.

Change-Id: If73ec0270e6b448d2487173707ff839f52f35caf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-11 16:03:34 +00:00
Miikka Heikkinen
c2fb654681 QmlDesigner: Handle undo/redo/manual edits while editing subcomponent
Undo/redo stack is reset when changing between subcomponent and
document edit modes, so we can assume any undo/redo is contained within
the component. Manual edits can still happen outside the component
code, but we can assume they are always limited to either outside or
inside the component code, as the only way to make a manual edit
that spans both is to delete a block that includes both, which
invalidates the subcomponent anyway.

Fixes: QDS-5392
Change-Id: I820de73f519215a9cb3672abc55d5aa60cce078a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-11 14:49:19 +00:00
Ivan Komissarov
bc0ebcf873 Update Qbs submodule to the top of 1.21 branch
Change-Id: Ic87a13079f9bedfe4c8e8934f386424a508c9eb3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-11 14:42:17 +00:00
Alessandro Portale
d7ed48ac6f Add missing "emit"s
Change-Id: I88a7397c7689b1e72cdd0e52077f8097443963c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-11 14:10:42 +00:00
The Qt Project
24ebe5a0ec Merge "Merge remote-tracking branch 'origin/6.0'" 2021-11-11 13:19:04 +00:00
Christian Kandeler
0c60370f3e ClangCodeModel: Fix Qt header completion with clangd < 14
The problem is fixed upstream, but this must work now.

Fixes: QTCREATORBUG-26482
Change-Id: I3b2e863efec0edf7eaa74d73eb94705aa28723cf
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-11 13:15:11 +00:00
Jarek Kobus
c9012704cc ApplicationLauncher: remove unused bringToForeground()
Surprisingly, it was also unimplemented.

Change-Id: I7845d321fd11c34cf70c944000657d9f782f0a5e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2021-11-11 12:22:29 +00:00
hjk
0781379345 Core: Use FilePaths in IVersionControl::additionalToolsPath()
Change-Id: I3c7d03b8695152f0830e809ce7a0709f48d8178b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-11-11 12:19:27 +00:00
Eike Ziller
164aae53d2 Merge remote-tracking branch 'origin/6.0'
Conflicts:
	src/libs/utils/theme/theme_mac.mm
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/debugger/lldb/lldbengine.cpp

Change-Id: I5f2c62e0bce6c91a53a554b3278dbe23ff7dde36
2021-11-11 13:04:42 +01:00
Thomas Hartmann
5cc183e0f7 StudioWelcome: Always initialize new project dialog
If the SplashScreen was disabled the new factory was not registered.

Change-Id: I3ab04510c33cb4ccfd2d85d3059ecafcc41fa654
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-11-11 11:32:27 +00:00
Tim Jenssen
2d1e4bcc5f qmldesigner: add ShowDebugSettings variable
also, enable it in debug mode always

Task-number: QDS-5461
Change-Id: I254bbcd081ee38b57e27bcb39ddb02506b1a2d4b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-11 11:12:36 +00:00
Samuel Ghinet
5d3b0f78e7 Fix: the wizards must use font icon constant names rather than codes
At every change made to the .ttf file, the unicode codes for the font
icons will change. Therefore, we can't use hardcoded unicode values for
the icons in QDS. We need to use constant names and translate those
names to unicode codes later, when passing to QML.

Change-Id: If032ae3defabc65319b4ebf5c1ed43c376eaea0a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-11 11:03:46 +00:00
Christian Kandeler
084dced9be ClangCodeModel: Provide signal/slot icons for clangd completions
Fixes: QTCREATORBUG-26555
Change-Id: I3b647f6fdbeed69bc453d64a69fb57731d92231e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-11 10:09:12 +00:00
hjk
aac740f127 Utils: Make Utils::is64BitWindowsBinary operate on FilePaths
Change-Id: I8ef840219bc93f77f5a55e38013facf892de759d
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-11-11 09:49:37 +00:00
Christian Kandeler
c97a144034 CppEditor: Move static variable to function
Following the principle of scope minimization.
Also, we got a reproducible crash-on-exit with MSVC with the original
code.

Change-Id: I465f4376fa7928de9bb878aee5faac992f75bf08
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-11 09:28:18 +00:00
Christian Kandeler
8d47a2f1e9 CppEditor: Add more logging to semantic highlighter
Change-Id: Ib862d0290700e4e3ed42e7359b3ac902d64ba650
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-11 09:27:49 +00:00
Christian Kandeler
af647841cf ClangCodeModel: Fix erroneous marking of lambda parameter
... as output argument when using clangd.

Change-Id: I35ef2da235cb317bb7eb1f08b865ea62c27d3b76
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-11 09:27:08 +00:00
Miikka Heikkinen
9ba2d2758a QmlDesigner: Adjust ComponentTextModifier offsets for whitespace change
Whitespace change can also occur inside the subcomponent code when
new nodes are added into subcomponent and the document is saved.
Changed the text change handling to adjust for whitespace changes both
before and inside the subcomponent code.

The new handling is simpler and doesn't require subcomponent to have
id to work. The downside is that non-whitespace changes before
subcomponent code are no longer adjusted for, but that was just a
hacky workaround for a small part of a much larger issue that needs
to be tackled properly anyway (i.e. supporting arbitrary
undo/redo/manual edits), so losing it is not a big deal.

Fixes: QDS-5362
Change-Id: I1ca1084baf78709727b1b4726b4c034558063401
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-11 08:52:22 +00:00
Miikka Heikkinen
305c91f42a QmlDesigner: Reset ComponentTextModifier when changing to doc model
A dangling ComponentTextModifier would still handle signals, so delete
it when it is no longer needed.

Change-Id: I67a70cf8b5e304a627ef92f9b4b8beecdd63cf0f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-11 08:51:35 +00:00
Cristian Adam
9d6b8727ee ClangCodeModel: Enable big object flags for building on Windows
Fixes problems with debug builds that link too many symbols into
the binary.

Change-Id: I6e95d6abd99a4f2a9a78764d8155a6e7b7fa8571
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-10 15:37:09 +00:00
Christian Stenger
730a1e6e42 StudioWelcome: Fix warnings regarding unused parameters
Change-Id: I56d0a9c18c963d1a505e8d40daa058f66d984d77
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-10 14:44:41 +00:00
Tim Jenssen
bf7cc1fa02 qmlpreview: enable language combobox
Change-Id: Ie1719d620608b94360a3831d138e1be25bae7b10
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-11-10 14:11:49 +00:00
Jarek Kobus
a3ae60d729 Uniform ApplicationLauncher API: get rid of finished()
Use existing processExited() signal instead.

Change-Id: I1eecaa05fa8b3a97d8585fca4ca89e8e1acecec3
Reviewed-by: hjk <hjk@qt.io>
2021-11-10 14:07:29 +00:00
David Schulz
d2ff57309b Client: make sure to reset project for client
Change-Id: I23860ee07c4f5793ce3247f46e8d925eae2b2bea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-10 12:50:07 +00:00
Jarek Kobus
15edfc85cb Remove unused m_exitStatus member
Change-Id: Ice572b27964b4c9a3977091caa3224585bc08879
Reviewed-by: hjk <hjk@qt.io>
2021-11-10 12:47:41 +00:00
Jarek Kobus
94c70d1933 Uniform ApplicationLauncher API: get rid of reportError()
Use existing error() signal instead.
Implement errorString() and processError() in non-local case.

Change-Id: Ibdd6cec19ffa5efa0dad330515988da80e86e35b
Reviewed-by: hjk <hjk@qt.io>
2021-11-10 12:47:22 +00:00
Christian Stenger
335f85c525 StudioWelcome: Fix qmake build on Linux with Qt5
Change-Id: I88fea1b3730e22866e1f365a6e605c375f5320c7
Reviewed-by: hjk <hjk@qt.io>
2021-11-10 11:59:05 +00:00
hjk
a8afa5c65c Debugger: Fix setting of Qt version fallback, again
Change-Id: I6b6cd448884800cb6d08dbdce15cb99f4ea8ba2b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-10 11:50:21 +00:00
Jarek Kobus
971b1b2269 Uniform ApplicationLauncher API: get rid of remoteProcessStarted()
Use existing processStarted() signal instead.
Replace isRemoteRunning() with isLocal().

Change-Id: I58d0204888116c00e793fa43f969707013db06eb
Reviewed-by: hjk <hjk@qt.io>
2021-11-10 11:38:48 +00:00
David Schulz
a0fba57508 LanguageClient: remove unused variable
Change-Id: I0910a0b75fe727c40c0249437895eb9d3566f7a2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-10 10:41:08 +00:00