Commit Graph

47434 Commits

Author SHA1 Message Date
The Qt Project
1bbcb89388 Merge "Merge remote-tracking branch 'origin/4.15'" 2021-03-22 09:56:01 +00:00
hjk
ce85282866 VcsBase: Remove VcsBaseClientSettings
It's replaced by VcsBaseSettings.

Change-Id: I60a0e4e267337f71e8a32b9b220565b765c973b1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-22 09:34:52 +00:00
Mahmoud Badri
e43a67447f QmlDesigner: Remove unnecessary method param
Introduced by d37f6648f3

Change-Id: Ib2f824c0a3755f4551b93f700bd0bb719a099003
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 09:24:36 +00:00
Eike Ziller
863260f1fd Merge remote-tracking branch 'origin/4.15'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/debugger/gdb/gdboptionspage.cpp

Change-Id: I4149e860b6842ea63bff3a7eb9632b7a6c2919d8
2021-03-22 09:52:14 +01:00
Marco Bubke
c2086e7854 QmlDesigner: Bump database version
Change-Id: I1342d85161e3d83de5411bd1a9ee97809b1ccfd7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 08:34:22 +00:00
The Qt Project
94bb3186f9 Merge "Merge remote-tracking branch 'origin/4.14' into 4.15" into 4.15 2021-03-22 08:25:05 +00:00
Kai Köhne
8d3563748a Make sure designer, linguist are also found in Qt 6 cross-builds
Do not try to locate designer and linguist via parsing mkspecs
anymore, since this won't work in a Qt 6 cross-build.

Instead, expect the binaries to be installed in QT_HOST_BINS.

Change-Id: Iab799770306e03e29f5f7afd2f92e824e66af25b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-03-22 08:24:46 +00:00
Eike Ziller
8a7b9fbdd4 Merge remote-tracking branch 'origin/4.14' into 4.15
Change-Id: I72ac4dab24021f0272a30400cc801387f0dcb558
2021-03-22 09:24:41 +01:00
Leena Miettinen
a76a3b38e8 Asset Import: Use double quotes for emphasis in UI text
Change-Id: Id9bdde4bcd1c0372f1d1e8ebc5accb75cda36af4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-22 08:14:46 +00:00
hjk
62974b0ad9 Subversion: Aspectify settings
Change-Id: I60a563511fce2e6487e8050541cedb086b0ab4e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-22 06:42:08 +00:00
Andy Shaw
7ec825be5e Android: Ignore an error when doing an incremental build
Since this is not really an error but it is outputted to stderr,
we need to explicitly ignore it so it does not show an error
dialog.

Change-Id: Ia972cf134278216c317649b5483e3deac683374d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-03-20 09:29:27 +00:00
hjk
4a2a0f1037 Mercurial: Aspectify settings
Change-Id: I689ce9a52124043e07472a1c95a3672f856232c3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 14:20:26 +00:00
Kai Köhne
c5ecb47c61 QmlDesigner: Retrieve rcc command centrally
Change-Id: I6886a22b51a002b48c248b3f49adc622c58c7ad8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-19 14:17:15 +00:00
hjk
fb9796ae8a Bazaar: Aspectify settings
Change-Id: I0354698cf3473dd096e57481a945f0f59afc75b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 14:08:42 +00:00
Aleksei German
3ad3f3ec16 Improve Qt Design Studio visibility in Qt Creator
Fixes: QDS-3765
Change-Id: I877da7c0caf153a48c17dbc9ced87ef54c1a082c
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-19 14:00:30 +00:00
hjk
78b4449692 CVS: Aspectify settings
Change-Id: Ib5170405b33b3e521470407065e85c95dad6163b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 14:00:00 +00:00
hjk
8d6cb35b74 Git: Remove note in settings dialog that does not apply anymore
Change-Id: I54e86ad419c09acc7ebd15bb4b2660d159c410f0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 13:51:27 +00:00
hjk
aa69415ac7 Git: Aspectify settings
Change-Id: I87dfeba360967cc77cc230811bcd9f67b3ea6e38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 13:39:33 +00:00
Cristian Adam
637d45c66a CMakePM: Make "Build type" aspect visible
For single configuration projects if you change the build type
aspect you will change the CMAKE_BUILD_TYPE variable.

When switching the build directory the existing CMAKE_BUILD_TYPE
will be set as build type aspect.

Fixes: QTCREATORBUG-25451
Change-Id: I13519e95c316c556cc1348fba6121637d2fd4275
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-19 13:38:18 +00:00
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
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
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
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
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
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
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
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
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
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
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
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