Commit Graph

68568 Commits

Author SHA1 Message Date
Cristian Adam
8eaf24a694 CMakePM: Fix assert with UNINITIALIZED build type
The typename needs to be STRING and not String

Change-Id: I2bddc4d7df17ff72b7e7e6ee2fa9947f2dfc1e6e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-19 13:36:04 +00:00
Leena Miettinen
0c968f518e QtQuick3D: Replace Type with Component
As the name of the section that shows common component properties.

Change-Id: I0d6b95ba7b4831d85e89b863a8e4b2e74ec50926
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-19 12:45:01 +00:00
Leena Miettinen
ad0b10e695 Doc: make Qt Quick terminology more consistent
- Use "component" instead of "QML type", "item" or "element"
- Hide Qt Quick and QML where possible (kept it in some Qt Creator topics)
- Fix references to imports, assets, and modules in Library
- Add links to the new Design view topics

Task-number: QDS-3778
Change-Id: I714aeb218efd4bdc1fc2f156194bf95ce3e174b5
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-19 12:41:29 +00:00
hjk
f2c34e51e9 Debugger: Fix setting of breakpoint by function name with GDB
Change-Id: Ib6194f9acc575ee089f11da6d1f3689eb7dee9af
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-19 12:08:04 +00:00
hjk
421d428e34 Utils: Make StringAspect's (potential) PathChooser accessible
This is not advised use, but helps to avoid an awful hack in the
AppManager plugin.

Change-Id: If40535dfb2c7bd15ff6d4fe49f4fa45d68150ef6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-19 12:06:27 +00:00
Erik Verbruggen
5ad724a3ac Support for QML module mapping
QUL uses module mapping for theming of QtQuick.Controls: during
code-generation the compiler is pointed to the Controls implementation
it should use. This is done by rewriting any import of QtQuick.Controls
with the given module name. The CMake build scripts will write a file
for each target to the directory "qml_module_mappings" in the build dir,
and those files will contain the mappings used.

Fixes: QTCREATORBUG-25356
Change-Id: I3f74897836dde7717b03bd6dffa46dcc0689ffdd
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2021-03-19 10:43:23 +00:00
David Schulz
5ae8700e92 LanguageClient: Add copy button to annotation tooltip
Change-Id: Ibe01543efa39e47de2b9d2d8e7302932bfcd413c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-19 08:57:48 +00:00
Eike Ziller
c34b950227 Add changes file for 4.14.2
Change-Id: Iaec33f8ffa103c335070ec363b9943fcbde86432
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
v4.14.2
2021-03-19 08:44:43 +00:00
Leena Miettinen
a497c13774 QDS Components: Replace "item" with "component" in UI text
Task-number: QDS-3778
Change-Id: I67cfaad948fe9a43b2312cdb5e248d0849b7c6d9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-19 08:43:13 +00:00
Christian Stenger
98dc428c69 Tests: Fix compile
Amends 0f6d04ce34.

Change-Id: Iee83ad5244bf1fa1ba47735ffab2154933d30460
Reviewed-by: hjk <hjk@qt.io>
2021-03-19 07:28:32 +00:00
David Schulz
f33aa99ddc ClangTools: Add tr functions to DiagnosticMark
Change-Id: I2563e8ab41d6c0d82be494236972ab528656b260
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-19 06:31:40 +00:00
hjk
a292a18c38 Utils: Shortcut Aspect::isDirty for aspects that were never visible
Also do not access Aspect::volatileValue if aspect was never shown

In this case, user-induced unsaved changes cannot exist. This also
avoids QTC_ASSERT in the volatileValue() implementations in these cases.

Silences the contained QTC_ASSERTs properly and avoids returning
a null-variant that's likely not identical to the default value.

Change-Id: Idba89997d0b0b4f9b7dcac0881afe36b35ccdf7c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-19 06:28:20 +00:00
Alessandro Portale
93fbd5be02 Remove dead code "< QT_VERSION_CHECK(5, 14, 0)"
Qt Creator required Qt 5.14 or higher. Let's removed the #idef-ed code
for building against lower Qt versions.

Add a comment in porting.h where we still need such code for sdktool.

Change-Id: Ib330275208eec4a2f285b4b9f480530c171f538a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 19:12:39 +00:00
Mahmoud Badri
c11f5ebd42 QmlDesigner: add directory import support to the item library
Also:
- fix removing used directory imports from possible imports.
- query imports from a hash for improved performance.

Fixes: QDS-3974
Change-Id: I69d072e24d39d3fa931493ab3cf2f821d5574c85
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-18 17:15:13 +00:00
Leena Miettinen
6d66b47b32 QDS: Check terms in Assert Exporter Plugin
Remove "QML" or replace it with something else.

Change-Id: I897e0c217fff705f3f5e045e532e2114f85d83bc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-18 16:50:50 +00:00
Leena Miettinen
31e4356b52 Splash Screen: Do not use contractions in UI text
Change-Id: I79498a57b113af313b05e9930374c73e9e26ff41
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-18 16:23:30 +00:00
Leena Miettinen
ce0574b61e VCS: Fix typo in UI text
Change-Id: If0328293a83ac50d388e81bbd06f4e2959e30a26
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 15:10:11 +00:00
Erik Verbruggen
e960062b80 QMLJS: Fix usage of default project info
The defaultProjectInfo in the model manager is used as fallback for
cases where no applicable ProjectInfo is found. There were a couple of
places where this should have been used, but wasn't. This showed when
adding a autotest that only used a defaultProjectInfo with no projects
defined.

Change-Id: If446212dbbdff02fbf1f220d401405d5f99d2de6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2021-03-18 14:34:04 +00:00
Erik Verbruggen
2361f26732 Support merged QML import paths with header paths
QUL does not have separate QML import paths, but (re-)uses the include
paths for this purpose. Support this behavior by adding all include
paths to the QML import paths before handing the project information off
to the QML code model.

Change-Id: Ic2e39ab69ac27776f5070b7b8b7c66d53a83210b
Reviewed-by: <christiaan.janssen@qt.io>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2021-03-18 14:33:55 +00:00
hjk
6a838d7c3c Docker: New empty shell
The usual boiler plate for plugins, including an option page that
knows how to run "docker search" for demonstration purposes.

Change-Id: I2df91f18f4869cbb2ee8f65ccb8b41969f8c90ae
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-18 14:16:42 +00:00
Ivan Komissarov
2d318780cd Update Qbs submodule to the top of 1.18 branch
Change-Id: I42928931324eef91b155badc687ffd5d20d63749
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 13:56:54 +00:00
Leena Miettinen
e2d33a85f2 QDS Property Editor: Replace "item" with "component" in UI text
- Write ID in all caps
- Some other small fixes

Task-number: QDS-3778
Change-Id: Ib959a2b8d31c7e51ea9ed1cae398b115b01e63f8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-18 13:07:22 +00:00
Leena Miettinen
810d959a2c Debugger: Edit UI text
- Make a tooltip unambigious
- Fix capitalization of Python

Change-Id: I3feb7d155a0e801b394f52c404fcf477ec3ac010
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-03-18 12:54:32 +00:00
Christian Stenger
b746a3e562 Unittest: Fix expectations
Amends 5fcd52fe83.

Change-Id: I68ce291176ab8e095b09ae6f0d64d2564e52cf0f
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-18 10:49:48 +00:00
Leena Miettinen
33c8c31dd8 Text Editor: Fix UI text capitalization
Change-Id: I888cfb4eb8c3b5934b45dcf80d751fb97d8f7624
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 10:24:46 +00:00
Leena Miettinen
8e5e5cc01a Core: Fix typos in and capitalization of UI text
Change-Id: I830539c7b8f3004b5143a02e3c1e8cea69fa1c81
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 10:24:37 +00:00
Leena Miettinen
4c58465b25 C++ Editor: Fix UI text to follow the guidelines
Change-Id: Icea20999410df78d01222d6ebcfb9cdd497d5068
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 10:24:19 +00:00
Leena Miettinen
131c7e869f Autotest: Fix capitalization in UI text
Change-Id: Ib25f3322bd7014489ab9aa18d9cfa0f1544ea8f6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-18 10:22:19 +00:00
Christian Stenger
a125535788 Nim: Pass on parse errors to issues pane
When parsing the config of a nim project we may have
parser issues that might be of interest for the user.

Change-Id: Iefec8194fe625110579cda8cf840e03945e677b9
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2021-03-18 10:16:40 +00:00
David Schulz
5945f1fa18 Highlighter: add new comment rules
Change-Id: I2f98c1374cab90f068db318051af2ea4be57cbae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 10:03:07 +00:00
David Schulz
2c81fe7302 Highlighter: readd autoconf highlighter
It isn't in the public repository of the syntax files, but it still
seems to work.

Amends: 14834e6b0a

Fixes: QTCREATORBUG-25391
Change-Id: I23819bdc79c5b4fab92b1150ed102f742a204e89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 09:59:46 +00:00
Jarek Kobus
d9bbf992f0 ClassView: Don't use explicit Utils scope
We already do: using namespace Utils; in this file.

Change-Id: I24a3b7ccb9f6175996240aa6b339809d98897f28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 09:11:24 +00:00
Eike Ziller
5c713d624c Merge remote-tracking branch 'origin/4.15'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I309fe2a4ea7afac85481fc6466a9a6e58e340019
2021-03-18 09:41:37 +01:00
Eike Ziller
62011851ae Merge remote-tracking branch 'origin/4.14' into 4.15
Change-Id: Ie467c5d63420041a9acffeb4a726130988ec0f41
2021-03-18 09:29:51 +01:00
Eike Ziller
f348e952b8 CMake: Make sure file node from project is selected
instead of node in file system tree, if it is available in the project.
For that, the nodes in the file system tree must have a higher priority
value than also the project file node.

Fixes: QTCREATORBUG-25493
Change-Id: I984adc0d205b2bac27782135772e49a6df2bbd0f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-18 07:51:42 +00:00
David Schulz
49acc4452e LanguageServerProtocol: remove unused constructor
Change-Id: I9307b00da7162f99d46ea66785f020daeddcc801
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-18 06:14:12 +00:00
Jarek Kobus
8fad758f60 ClassView: Fix a possible crash on session switch
Don't call SessionManager methods in non-main thread.
It's not safe to call SessionManger::projects() or
any method of Project class in a non-main thread,
as in meantime the Project object may get deleted
or the Project object may change in main thread in
a not thread-safe way.

Instead, prepare the data needed for the parser's
thread before, when scheduling a call in a main thread,
and pass this data in a safe way.

This fixes possible crash in class view, e.g. on session
switch.

Task-number: QTCREATORBUG-25317
Fixes: QTCREATORBUG-25312
Change-Id: I114aae788aec649d1de3b3d3afdd049ed1e9b2c6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-17 19:50:28 +00:00
Knud Dollereder
ced7a2e51f Emit frame-changed signals on valid timelines only
Fixes: QDS-3876
Change-Id: I57605849d9a2f20d79dbae54f8c4c58ee8dcb192
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-17 15:49:01 +00:00
David Schulz
a52f468bc5 Editor: Fix crash when setting language id before document
Change-Id: I735484c7036f6c8b26142d114348295d9b12ae97
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-17 14:26:28 +00:00
hjk
0f6d04ce34 FakeVim: Set settings page to manual apply
The default is badly chosen, but it's what it is for now.

Tested best with the "Show line numbers relative to cursor"
option, which should have immediate effect on "Apply" - and only
then.

Change-Id: I78864457b44032810b78fdef9e4a5ac4c287dd50
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-17 14:18:22 +00:00
hjk
9602338ce8 Utils: Fix manual apply of BoolAspects
Amends b7acf45c1. The primary connection was already there, and
correctly if'd, and the patch added accidentally a second connection
which was harmless in the auto-apply case, but effectively made the
manual-apply case also auto-apply.

Change-Id: I5ee72ff4715fb0077a47f71e8d45a5b6251c4121
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-17 14:12:37 +00:00
Christian Stenger
73ff6996b2 Highlighting: Fix compile before Qt5.15
Amends d4c4f8c007.

Change-Id: I8f6c16b373500ab2fedbc4d43ccfb503565eccbd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-17 13:40:59 +00:00
Eike Ziller
38ce4fb4ec CMake build: Fix issues with Devel package for qmake-based plugins
Add the pch files that qmake uses.
On Windows, the .lib files must have the major version too,
like the DLLs.

Change-Id: I437bbeac0323c5b9bc174ddea8c0d9be6497b4e6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-17 13:15:58 +00:00
Alexandru Croitor
27f299d9b5 CMake Wizards: Advertise manual finalisation
In qmake projects it is possible to run arbitrary qmake commands after
the whole project is parsed, which is used extensively by Qt to do
things like importing qml plugins, generating android deployment
files, etc.

In CMake this feature was implemented in 3.19+ and we leverage this
feature to do all the things described above when such a version is
used.

But when projects are built with earlier CMake versions, it's better
for users to do these steps manually, rather than letting them to
happen at qt_add_executable call time, which limits certain
configurability.

That can be achieved by adding a call to qt_finalize_executable at the
very end of the directory scope where the target was created,
in addition to adding the MANUAL_FINALIZATION option to the
qt_add_executable call.

Augment the wizard templates to advertise the existence of
qt_finalize_executable, as well as making sure that projects created
by Creator can work reasonably well with older CMake versions as well.

Change-Id: Icf60eae993cf815f6cce6ed659fe35264b016f62
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-17 13:12:18 +00:00
hjk
4fe9b631af QmlDesigner: Fix compilation with namespaced Qt
Amends f5a49e6b0b.

Change-Id: I7f1d3163944944e1f3504540b4dafb251ba8e9a8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-17 12:04:57 +00:00
hjk
e18134a2bd Nim: Simplify NimbleBuildStep implementation a bit
Change-Id: Ifc5a2bee0ac2fc2e9e7d5a474c0453ec49ae733f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-17 12:04:47 +00:00
David Schulz
9129dffe55 Editor: Qt6 compile fixes for KSyntaxHighlighter
Change-Id: I5f00cb8e948762da8f855059dcf90b7857d57482
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-17 10:35:39 +00:00
David Schulz
d4c4f8c007 Highlighting: update KSyntaxHighlighting to v5.80.0
Task-number: QTCREATORBUG-22558
Change-Id: I57d782397f88842edbd08b1008b2d88706c6ab52
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-17 10:35:36 +00:00
David Schulz
d187022892 TextEditor: update codeStyle after setting language id
This updates the tab settings to the correct one for the specific
language like C++ or QML. Only observable if the file is not part of a
project. Otherwise the project code style settings will set the language
specific tab settings.

Fixes: QTCREATORBUG-25485
Change-Id: I736646557a213369903fe495e3b5a3a950141961
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-17 10:35:21 +00:00
Marco Bubke
9b1f4f7c29 Sqlite: Update documentation
Change-Id: I0c6a7fc82ee3ae22c4c4f74567b3198c71dc592b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
qds/v2.1-beta1
2021-03-17 09:11:52 +00:00