Commit Graph

66382 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Henning Gruendl
6a1f51b195 QmlDesigner: Add button to component specifics
* Add a button to component specifics for simpler access to the
  component. Currently it is only possible to access a component via
  the context menu "Go into Component" or shortcut F2.
* Add image template
* Fix other templates
* Cleanup component specifics and introduce nested sections

Task-number: QDS-3062
Task-number: QDS-2358
Change-Id: I6b245b013fbf4b960509b0a357ae62d20e0383cc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-06 09:52:29 +00:00
Miikka Heikkinen
50405d7153 QmlDesigner: Fix 3D material preview when QtQuick3D is not imported
3D material preview is not dependent on QtQuick3D import in the open
QML document, so we can enable it even when QtQuick3D is missing.

Change-Id: I5cb35ef403599704684ebe87c81cd949f828ad00
Fixes: QDS-2912
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-11-06 09:21:33 +00:00
Henning Gruendl
f2883c19b1 QmlDesigner: Add lock feature support to 3D editor
Added lock feature support for 3D editor. Also refactored the hide
support, since the two use largely similar logic.

Task-number: QDS-2915
Change-Id: I627848f3a3a73881427a03aeec6793fd26a1885a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-06 09:19:05 +00:00
Aleksei German
3d78fef4ef QmlDesigner: Rotation Tool
- Added Rotation Tool to Form Editor
 - Rotation Tool is activated on items corners
 - Supports alt and shift modifiers
 - Works with MCU projects
 - Uses new rotation icon

Task: QDS-2881

Change-Id: I9905968b7ac31d008184e343294fbd33cdb45c1c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-06 09:12:49 +00:00
hjk
1dd7595e60 LanguageUtils: Fix an implicit conversion to QChar
This here looks like an actual bug discovered by having QChar(char)
explicit in Qt 6.

As the code is unused, no visible change is expected.

Task-number: QTCREATORBUG-24098
Change-Id: I890cf1634f5c6e1ed6230644cdb34e899d437878
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-06 09:04:40 +00:00
Eike Ziller
3ec8169137 Utils: Don't derive BaseAspects from QList
Use composition instead.
Exporting classes (on Windows) that are derived from QList doesn't seem
to work with Qt6, and it can be argued that composition is to be favored
anyhow.

Task-number: QTCREATORBUG-24098
Change-Id: Icc18fac6680fa09e50b60ed676265e85ee00a89e
Reviewed-by: hjk <hjk@qt.io>
2020-11-06 08:59:15 +00:00
David Schulz
30b6147e80 Debugger: fix dumper for msvc release builds
... for std::vector and std::string.

Change-Id: I5c823b6c1b7b510344eeea4e1d5db0791d5c8e53
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-06 08:13:35 +00:00
Eike Ziller
e101e83f84 Do not try to deploy QtQuick1 imports
We don't ship them with Qt Creator since a longer time now, and in Qt6
they are completely gone.

Change-Id: I7c6b1da1782cb641e17b2d1c7ff764dd81e15ee6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-06 06:57:10 +00:00
Andre Hartmann
86a5f81414 Git: Fix initial focus in LogChangeDialog
Make it possible to use the cursor keys
without having to click into the list first.

Change-Id: I47861a5a1df7cbfe65a020299b0455e5833492d5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-11-06 06:27:21 +00:00
Christian Kandeler
bf53fc292d Utils: Fix qbs build
Change-Id: Ic8dc9240b0d2bcb1af82373f657fc4ef759cd14c
Reviewed-by: hjk <hjk@qt.io>
2020-11-06 05:41:48 +00:00
Christian Stenger
f2b5c29494 Tests: Fix linking of test project
Avoid fail to link when using Qt5.15.1 and MSVC 2017.

Change-Id: Ief4edce7490c4828c46033c7a055acb6173c94e1
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-06 05:22:02 +00:00
Christian Stenger
52c48ed232 CMakePM: Improve error output handling
This avoids a soft assert for a missing description
and correctly prints the error on the Issues pane.

Change-Id: Ieaeacf404b4a5b323bac215af72877480f627cf8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-06 05:21:41 +00:00
Assam Boudjelthia
33b06f5b81 Android: avoid adding ANDROID_ABIS to the project file
Use buildSystem::property()/setProperty() to keep track of the
selected ABI and avoid polluting the *.pro file with it.

Task-number: QTCREATORBUG-24674
Change-Id: I5516a77c9f2d1a8975045e1d7c383e72c52db9d7
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-11-05 17:08:46 +00:00
Jarek Kobus
291991f1d2 Compile fix in serialize_container when building with Qt 6
After bfc6e2d69d2514f7b4e889d08475972eb2f340a6 in Qt 6
we have a different signature of QList::append when QList
is instantiated with a pointer to type (T *). After the change
we get QList<T *>::append(T *), and before we got
QList<T *>::append(T * const &). This breaks the code in
serializer.

In addition, get rid of warning: "use of function template name
with no prior declaration in function call with explicit template
arguments is a C++2a extension". In order to fix it, we explicitly
declare the full function signature and let compiler choose the
right overload of attr() function template.

Change-Id: I4132a1307faa9a6bd1b585251a6bb5189a0b1764
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-05 16:59:55 +00:00
Eike Ziller
d24c34c747 cmake build: Disable refactoringbackend and pchmanagerbackend
Disable the libs and executables if not needed by either the plugins or
by the tests.

So far in the cmake build the ClangRefactoring and ClangPchManager
plugins were disabled by default, but the backend executables were still
built. With this change the executables are not built if the plugins are
not enabled, like it is the case in the qmake build.

To make it possible to build all the tests even though the plugins are
disabled by default, the backend libraries are still built if tests are
enabled.

Change-Id: I3b61479525e1472a55215f1b003fea9facaf9e93
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-11-05 15:11:39 +00:00
Assam Boudjelthia
4035fc2433 Android: update Sdk tools links and build-tools version
Fixes: QTCREATORBUG-24621
Change-Id: Id1b11452631612bc2b03af1d23cb78bc9b439316
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
2020-11-05 14:47:34 +00:00
Marco Bubke
6364692e15 Utils: Move set algorithms to Utils
So it can be used in other plugins which does not depend on clang.

Change-Id: I80b9f44609921951444e13c5fd35476c047ad579
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-05 13:46:02 +00:00
Thomas Hartmann
938d9d919b QmlDesigner: Only restore auxiliary data the first time
Since we only save auxiliary data when the document is saved,
we would otherwise override removed auxiliary data.

Task-number: QDS-3075
Change-Id: I22c6ea6be1ecda4b0323a58d8ce3e8963c194266
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-05 13:42:08 +00:00
Miikka Heikkinen
b48fc5ae4f QmlDesigner: Initialize visibility correctly for form editor items
Change-Id: I00663d2a2d5e109fde01dfec281d67552ca7ddb8
Fixes: QDS-2913
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-05 12:44:09 +00:00
Johanna Vanhatapio
8f69e3d317 Doc: Add the Optimal 3D Scene to examples
...and link to Creating Optimized 3D Scenes.

Fixes: QDS-3020
Change-Id: I666afca460e9e0e3afb2b612780f486a094cb45c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-05 10:42:07 +00:00
Christian Kandeler
7ac879a133 ProjectExplorer: Add some global variables for the active project
Fixes: QTCREATORBUG-24878
Change-Id: I401300e72a546fa53a53b9b0098956a973f8de2e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-05 10:00:21 +00:00