Commit Graph

67787 Commits

Author SHA1 Message Date
Christian Kandeler
ad48f2639c ProjectExplorer: Consider build environment
... in "Open Terminal Here" action in the build configuration.

Change-Id: I0b1b15d4f1097cf48eb5a977f2ca5951b2f78377
Reviewed-by: hjk <hjk@qt.io>
2020-11-10 09:01:48 +00:00
Eike Ziller
6813d14872 Fix build against Qt6 with GCC 7 / Linux
Add some missing includes for otherwise incomplete types.
Make LanguageServerProtocol::JsonObject's iterators and end() methods
public. Otherwise QMetaType fails for
LanguageServerProtocol::ServerCapabilities which is used in a signal
from LanguageClient.

Task-number: QTCREATORBUG-24098
Change-Id: Id7f8a4146afb927a8589fadaefe42f7fbca45dd3
Reviewed-by: hjk <hjk@qt.io>
2020-11-10 08:25:46 +00:00
Orgad Shaneh
3122a1bfc5 Aspects: Remove some more default values
Change-Id: Iadee8b8f1eeb3ff009a667d45a51f6f5a94329ca
Reviewed-by: hjk <hjk@qt.io>
2020-11-10 08:06:51 +00:00
Leena Miettinen
ac6bfd0620 Doc: Fix changed IncrediBuild settings accordingly
Change-Id: Ie704bea887bf77461be07f7332087e2413134e09
Reviewed-by: hjk <hjk@qt.io>
2020-11-10 07:37:18 +00:00
Tim Jenssen
6edf6e4dc1 qmldesigner: add missing includes
Change-Id: I3f8ebb842e857525f444d950e5886a8cd3c0320c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-09 21:10:51 +00:00
Henning Gruendl
f66e2f508f QmlDesigner: Fix navigator selection issue
* Fix navigator selection issue caused by clicking on icon columns of
  a locked item
* Fix visibility icon in icon font
* Remove redundant selection behavior call

Change-Id: I03c97b22d92bcf0760b2b9ec627609624a0b3695
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 19:37:58 +00:00
Tim Jenssen
fceaff1a6f cmake expects forward slashes here - even on windows
Change-Id: Ia31727b703745e01d6def91237a0bc46ea37261a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-09 17:35:51 +00:00
Aleksei German
d4653175e4 QmlDesigner: Return Annotation context menu action
Addition to QDS-2970

Change-Id: I92834e047ba76c2cfbfb0f6a10cbd7618cb0dbe7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 17:23:29 +00:00
Jarek Kobus
4c7032fb1e Make CppProjectUdpater a final class
Silence the warning:
"Call to virtual method 'CppProjectUdpater::cancel'
during destruction bypasses virtual dispatch".
CppProjectUpdater's d'tor calls cancelAndWaitForFinished(), and
the latter calls in turn virtual cancel() method.
As long as we don't have subclasses of CppProjectUdpater,
calling a virtual cancel() from the d'tor should be safe.

Change-Id: If2ebe6a190649319401d4e4b0f6977f547c51dac
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-09 15:25:13 +00:00
Mahmoud Badri
91ad88205a Optimize checking keyframes in clipboard
Old implementation is expensive (~200ms) and this method is called
frequently. Also prevent pasting keyframes in the FormEditor.

Change-Id: Id083b553231893be31c7aab1d0da1809529316c8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 15:08:57 +00:00
Eike Ziller
6514e1b866 Fix lupdate issues
Change-Id: I1971f74a54e4afe2d106c105f6b38f415bef488f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-09 14:55:56 +00:00
hjk
864a3fa0e7 Incredibuild: Change some of the displayed strings
Change-Id: I7638be248031c8262e3d0adf92479fdd6c1fb5f4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-09 14:22:28 +00:00
Orgad Shaneh
836fbed090 Aspects: Remove keys with default values
It was done for some of the types, but not all. This reduces a lot of noise
from the output file.

Change-Id: I64a99e7725ad7cca1f0d90dc296c58c71334ecff
Reviewed-by: hjk <hjk@qt.io>
2020-11-09 13:37:46 +00:00
Christian Kandeler
e41f3eb607 CPlusPlus: Fix "find usages" categorization for sizeof and array access
Task-number: QTCREATORBUG-24894
Change-Id: I65fa097785b19e181f15178ad6d30608899316c0
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-11-09 12:50:07 +00:00
Orgad Shaneh
79b0d2bbf5 ProjectExplorer: Add a missing emit
Change-Id: I8eae3f6eca24f6014825354141be377acd20990f
Reviewed-by: hjk <hjk@qt.io>
2020-11-09 12:43:58 +00:00
Leena Miettinen
9688f33a5d QML Preview: Fix UI text
Fix capitalization and make some strings shorter.

Task-number: QTCREATORBUG-24873
Change-Id: I78d0d1507774ab732f633f8849a3f45f6835110f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 12:42:25 +00:00
Christian Stenger
564fa06399 CMakePM: Fix missing include
Change-Id: I7ed4045aa5b6b85fbf6a332161a3ad0e94bff348
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 12:27:35 +00:00
Orgad Shaneh
51131848ba Aspects: Do not store values with empty keys
Change-Id: I9e8b62915a2278fc3ab35e8b09a330bc0a52e4ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-11-09 12:21:13 +00:00
Eike Ziller
743877730b cmake build: Fix branding
The cmake build used IDE_ID in too many paths that are actually
not branded (yet?).

Change-Id: I019dd806975ef2205aa946bc3b27b0675233e1ea
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-09 11:04:50 +00:00
Christian Stenger
617a8aee2b CMakePM: Start integrating ctest
Gather some more information of a CMake based project to be
able to provide this later on to the AutoTest plugin.

Task-number: QTCREATORBUG-23332
Change-Id: I2beaf0a6456d57871dcf65832f0a79f37fe5fddc
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-09 11:02:37 +00:00
Christian Stenger
c44e13a3f8 PE: Prepare build system for providing test information
This allows later on to provide build system based test runs.

Task-number: QTCREATORBUG-23332
Change-Id: I7e26cd2b6a7d304faec79363ce4c2368287c2300
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 11:02:28 +00:00
Leena Miettinen
bc9711f4cf Conan: Fix UI text punctuation
Task-number: QTCREATORBUG-24873
Change-Id: I92c255218fddd985857e43025349855f2e7975ec
Reviewed-by: hjk <hjk@qt.io>
2020-11-09 10:59:42 +00:00
Christian Kandeler
882dd60aad C++: Extend alias declaration support in built-in parser
The type-id in an alias declaration can also define a new type.

Change-Id: I65dc397d2526c56334676c6ab522564f6748d594
Task-number: QTCREATORBUG-24875
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-09 10:56:17 +00:00
Christian Kandeler
42d34015e2 CPlusPlus: Provide information about the "static" specifier
... to the function type.
This fixes the issue for function *definitions*. For function
*declarations*, we need to amend the parser.

Task-number: QTCREATORBUG-24894
Change-Id: I02043d8b974c2c64dcd739c7e05ce44fd277b5d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-09 10:55:38 +00:00
Dmitriy Purgin
53115259ba CMakeProjectManager: Add File System virtual folder
If a CMake project cannot be parsed by CMake, it is practically unusable in
Qt Creator. According to discussion in QTCREATORBUG-24677, a virtual
folder with the project's file system view is added to the project
manager as a convenience feature.

Fixes: QTCREATORBUG-24677
Change-Id: I48775bb89c704d3f7e5bb21ec6481bd5cc0f4b6c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-09 10:48:14 +00:00
Leena Miettinen
1e2939916e Qt Quick Designer: Fix UI text
Fix capitalization, punctuation, style, and typos.

Task-number: QTCREATORBUG-24873
Change-Id: Iecf7781d604b799563457cf000ab5f48e06b251c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 09:56:49 +00:00
Leena Miettinen
f2254419af Project explorer: Fix UI text
Fix punctuation.

Task-number: QTCREATORBUG-24873
Change-Id: I5cc5e80915b891efa2cd2268e3302feb39b7a576
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:52:12 +00:00
Christian Kandeler
1988d89198 CPlusPlus: Check for static member functions in FindUsages
Static member functions cannot modify the object and therefore must not
be reported as writable references.
Note that this does not have an effect yet, as the function type lacks
information about the "static" specifier.

Task-number: QTCREATORBUG-24894
Change-Id: Ib04a17864a0ca5b7610579a2f5efbcfde257e08a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-09 09:51:08 +00:00
Jarek Kobus
fdaed3aa09 Fix qmake build against Qt 6
Change-Id: Iee5154e5b48c1e7f41d682f2ec7040202366db77
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-09 09:22:28 +00:00
hjk
56eb7628c3 Qbs: Continue aspectification of QbsBuildStep
This changeset only goes half-way, by introducing and using
aspects for the easy cases (five bools and the job count int).

Change-Id: Idb3a050f8bdd0c2c4eaf1c1d1cb4d71a5343321e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:21:31 +00:00
Christian Stenger
a140dc850e AutoTest: Fix missing include
Change-Id: I38f6fb951f9c28c5ca0cd9b671809d61a1664c2d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:20:18 +00:00
Leena Miettinen
c742f0ac9a CMake: Fix UI text capitalization and punctuation
Task-number: QTCREATORBUG-24873
Change-Id: I2672d0360cc8a6b41f711ca9db0f76750639da4e
Reviewed-by: Asit Dhal <dhal.asitk@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:07:30 +00:00
Leena Miettinen
2bb1ff6077 CPP Editor: Fix UI text capitalization
Task-number: QTCREATORBUG-24873
Change-Id: I166b2aa8867e694d0b3ba1756edd0afc6e487211
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:07:19 +00:00
Leena Miettinen
8362c3924c VCS Manager: Fix UI text style
We are trying to move to using shorter text.

Task-number: QTCREATORBUG-24873
Change-Id: I984c1cbc7fe31e74fc1ec90e500bbec3bd2b429c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-09 09:07:06 +00:00
Christian Stenger
ac14a1e038 AutoTest: Clean up header mess
Better decoupling and reduced binary size.

Change-Id: I4f6239979d9d7dae4ad92f19ec8420be38372c07
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-09 08:24:01 +00:00
Andre Hartmann
c922709f33 Designer: Fix escaping '&' again
It seems impossible to show a single '&' character
on UI elements, as this character is also used for
the mnenomics.

So having a single '&' followed by a space creates
a space character, having two of them ("&&") creates
an underlined '&' (seen on Windows and Linux).

So let's just work around this long-living issue
and avoid the abbreviation.

Amends commit bc37a9ab7d

Change-Id: Ibcbfcac62d7be8c091ab2fc51621bddc9dad7e00
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-09 08:23:50 +00:00
Christian Stenger
24db5dcc4f AutoTest: Use base of framework inside TestTreeItem
...and respectively inside the parse results which hold the
information that are used to create the items.

Change-Id: I78f7b5632df5d449d39fa03ffbf48036a138e337
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-09 08:23:00 +00:00
Christian Stenger
f9cb699211 AutoTest: Rename IFrameworkSettings to ITestSettings
...and move and rename frameworkSettings() function from
ITestFramework to the new base class.

Change-Id: Iedd883d1ffb9a57a4215a24f66f5422a46060a09
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-09 08:21:57 +00:00
Christian Stenger
5cc7fc6a2d AutoTest: Introduce ITestBase
Make ITestBase the base class for ITestFramework.
Preparation for adding support for testing tools.

Change-Id: If9184dcbd94c10b17bba83c0d02b0ecb50458e67
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-09 08:01:26 +00:00
Aleksei German
4e4ec44a5d QmlDesigner: Fix tests build
Change-Id: I65190e74a3dfb76991650463bf91b40a285d7384
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-06 16:36:58 +00:00
hjk
81c4d59346 FakeVim: Fix use of implicit QChar(int) constructor
Change-Id: I79a778a1e32dae8b2c1f7d49d4c4e655cf51b1fb
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-06 14:59:33 +00:00
hjk
6baf09bf91 ProjectExplorer: Remove toolchain settings compatibility with <= 4.3
As data point: Ubuntu 18.04 has Qt Creator 4.5.

Change-Id: I2794197e511666b3931fb8efc2669a574e6f1ac9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-06 14:59:15 +00:00
Leena Miettinen
df15c95fe9 Doc: Fix navigation for the Images topic
Change-Id: Ic47bab541276817ff29d5f4fa04c46cc3ebb1e87
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-06 14:45:47 +00:00
Leena Miettinen
750bddf286 Doc: Describe image properties
Describe the properties of the AnimatedImage, BorderImage,
and Image types.

Fixes: QDS-2850
Change-Id: I0f31f75454fb20442ddedc41f6613aeb3168cecd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-06 14:24:34 +00:00
Leena Miettinen
0d01ff7f68 Doc: Add data model, view, and delegate properties
Describe using Qt Creator/Qt Design Studio to edit data
models.

Move Path View and Svg Path docs to the new topics using
\include files.

Fixes: QDS-3030
Change-Id: I1ea09e133a4f1fe20c6e89a6323158eb1ce16c33
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-06 14:15:23 +00:00
Christian Kandeler
4ad078b73a CplusPlus: Try harder to find a class
... when looking up a member function for categorization.
Contrary to our expectation, the first entry in the lookup results is not
necessarily the best fit.

Task-number: QTCREATORBUG-24894
Change-Id: I1ba6dbebeecd8c4a24fa53194996271339018d9c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-11-06 13:45:38 +00:00
Christian Kandeler
7116c7c60f CppEditor: Fix doxygen continuation
... for the case where the cursor is on the first line of the comment.
At this point, we have just found out that no initial skeleton is to be
created and that we want to do a continuation instead. Therefore, we
need to rewind the cursor position, so handleDoxygenContinuation() will
receive the original cursor.

Fixes: QTCREATORBUG-20677
Change-Id: I42f1b83df624a9833fe13e1fa01e41c5c6c45334
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-06 12:32:13 +00:00
Christian Kandeler
a68ec8ae24 clangbackend: Work around wrong cursor info from libclang
Alias type declarations of in-place struct definitions are not reliably
getting their cursor exposed, so the surrounding context is reported
instead, which causes the wrong lexical parent to be deduced. To the
user, this manifests itself as a wrong hierarchy being displayed in the
outline.
We try to detect this condition and correct it manually.

Task-number: QTCREATORBUG-24875
Change-Id: Ib4e177efa9148697eddde986a91fdd5d7b272d76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-06 12:31:52 +00:00
Assam Boudjelthia
d604d5da18 Android: fix passing ANDROID_SDK_ROOT for CMake
Task-number: QTBUG-87991
Change-Id: I70ed0709caf339324af8c233f311a2db2945006e
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2020-11-06 10:58:32 +00:00
Christian Kandeler
06b653879f ModelEditor: Guard project pointer in queued connection
We cannot assume that the project pointer is still valid when event loop
execution continues.

Fixes: QTCREATORBUG-24893
Change-Id: I9a3f7a3fae45a04054da6f81c1c8e3181f658de4
Reviewed-by: hjk <hjk@qt.io>
2020-11-06 10:56:13 +00:00