Commit Graph

47434 Commits

Author SHA1 Message Date
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
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
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
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
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 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
hjk
d26d9250b2 QmakeProjectManager: Use StringAspect for effective qmake call
... in QmakeStep.

Change-Id: Idf8ef37f99e08cd3462af4e4dd2b1639f82694df
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-05 16:08:45 +00:00
hjk
3ab54e91b1 QmakeProjectManager: Use ArgumentsAspect in qmake step widget
Change-Id: I7e12a571841f85f80c6439d5e7e834ff7c53305d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-05 14:59:39 +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
hjk
b1d3eee42d ProjectExplorer: Set focus to TargetSetupPage when shown
This ensures the "Configure Project" button can be activated
with <Return>

Fixes: QTCREATORBUG-20720
Change-Id: Ia20848cf2b4a1a2fcd33f9652a9a09796fd85c54
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-05 12:52:22 +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
hjk
95c13eecda ProjectExplorer: Fix typo in ArgumentsAspect documentation
Change-Id: I634e0126a3286df8343b061a2056f97f10ce67f1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-05 12:33:23 +00:00
hjk
08f3696f21 ProjectExplorer: Add shortcut to "Configure Project"
Note that this does not work with 'Return' immediately, as the focus
is usually on the left tree view in that situation. <Tab>, <Return>
work.

We can try to switch the focus by default in a separate patch if
that is wanted.

Task-number: QTCREATORBUG-20720
Change-Id: Iffbf7f2c1493947b847fd9c89e86b4de56a65543
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-05 10:19:47 +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
Alessandro Portale
aadc28a924 ProjectExplorer: De-duplicate two overrides of ToolChain::makeCommand
They originally were identical, but already started diverging.

Change-Id: I977f0e54d1ba308bbeddd775ac0e903f6f359234
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-05 09:58:36 +00:00
Christian Kandeler
3418f09da7 CppEditor: Do not omit template types
... when rewriting an argument of a refactored function.

Fixes: QTCREATORBUG-24892
Change-Id: Iddc6d1787155885d0a8150b1afdb4eaecd6f3a6b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-05 09:49:46 +00:00
Nikolai Kosjar
888ea6bbbb CppTools: Take "-include" files into account
Fixes: QTCREATORBUG-20602
Change-Id: Ibfc518fc64ed75f93265db800558ec1d2e424bb4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-05 08:49:24 +00:00
Jarek Kobus
34c97ac868 Fix a build with Qt 6
In Qt 6 implicit conversion between QFuture and other types
is forbidden. Make it explicit instead.
See ff0ba7e2d7b91fd5809cb314935a1ca1a436f6c9.

Change-Id: Ie42e6b9b5047ba5eeec9f63fd03179e73f95314d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-05 08:46:43 +00:00
hjk
c05ad9a951 Debugger: Allow copying only selected lines in stack view
Fixes: QTCREATORBUG-24701
Change-Id: Ica81a4e96bc5d888efca4307f91ebdca2488003a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-05 08:39:21 +00:00
Miikka Heikkinen
8ffd3d20a5 QmlDesigner: Add support for specifying extra files to library entry
Extra files specified in the ItemLibraryEntry will be copied to the
same directory as the qml doc.

Change-Id: I6f10e7ba8114355cbf68bc4b306f0500a81dbad2
Fixes: QDS-2635
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-05 08:38:26 +00:00
Jarek Kobus
c0408ed52e Compile fixes with Qt 6
Change-Id: Ia5335bef6aeaff3ce12339db52d96793ff588824
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-05 08:14:55 +00:00
Christian Kandeler
98499e7caa CppEditor: Do not offer generated QObject functions
... in "create implementations" quickfix.

Change-Id: Ie8aa00e432afdf1338d4897ad211c15fef753404
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-04 14:19:04 +00:00
Thomas Hartmann
7899035c05 QmlDesigner: Add float as animatable type
Task-number: QDS-3041
Change-Id: Idc5001c3af1631668ac8c9b6f7e3ecc26aa0802f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-04 13:42:45 +00:00
Thomas Hartmann
0d6792fbfb StudioWelcome: Update tutorials
Change-Id: I7c5dad8a355dca562a7046d05dd71089f3d60d79
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2020-11-04 13:42:39 +00:00
Christian Kandeler
a88266798f CPlusPlus: Differentiate declarations with an initializer
... from those without one, and display the former like write accesses.

Task-number: QTCREATORBUG-24894
Change-Id: I5e2d83b2a3ec4735054441c346687f97eeb039fb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-11-04 13:02:52 +00:00
Eike Ziller
8527cbedcc Fix more compilation issues with Qt6
Various Windows related issues and issues with additional QML designer
components.
Don't use very generic template definitions if the type has to provide
not so generic base functionality (in this case providing a stream
operator for QDataStream).

Task-number: QTCREATORBUG-24098
Change-Id: Id0729c249d1b81e4e939fdaeb2e02b8a64e7e8f9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-04 12:52:17 +00:00
Henning Gruendl
241b45005a QmlDesigner: Update icon font
* Add rotation icon

Change-Id: Id1a0ae47edc10370c44fdc39082a2cd0bc9be4cb
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-04 10:36:28 +00:00
Aleksei German
e5783fb6d0 QmlDesigner Fix for semicolon
Change-Id: I2cf3fa6186f7baaf05d243ef4e7d67e88469b5d9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-04 10:30:35 +00:00
Alessandro Portale
c5544c30f2 WebAssembly: Fix Qt 5.15 for WebAssemby ABI detection
The Qt 5.15 for WebAssembly binaries published via the Qt SDK installer
have a different binary format. Like in previous versions, the static
libraries are in the "ar" format. However, the packaged .obj files, from
Qt 5.15 on, have the '∖0asm' magic number.

Fixes: QTCREATORBUG-24891
Change-Id: Idc6004dfc0949280a1d5f257c462d094fa51f5a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-04 10:24:50 +00:00
Aleksei German
9a73a1da0f QmlDesigner: Fix for PropertyEditor in MCU project
- Fixed bug with childless items properties

Change-Id: I660dc8d82d693c7e1b3f0e94fa040d61675df6f8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-04 09:30:27 +00:00
Assam Boudjelthia
cb34bfc493 Android: add line breaks to new AVD warnings
Change-Id: Ie533c468717674959060c7732952892086f37640
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-03 15:10:00 +00:00
Assam Boudjelthia
54667ae51c Android: disable Ok button for new AVD dialog if there is error
Change-Id: I626e80f540e42d726f37cd4802a14a32fa46595d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-03 14:30:13 +00:00
Jarek Kobus
0dcdb43ddb Fix missing documentation when built with Qt 6
The default value for readOnly property of QHelpEngineCore
changed to true in Qt 6. We need to set it to false by hand.

Task-number: QTBUG-87783
Change-Id: I6b0d4f043797463b3437a6aef673eba8e1b9c3ad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-03 12:10:49 +00:00
hjk
7add8a81db QmakeProjectManager: Use SelectionAspect in QmakeStep
For the Debug/Release combobox.

Change-Id: I494778c0f633a34a25a97217b94321ef1944e588
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-03 11:47:25 +00:00
hjk
eedb702bb9 Meson: Make spacing and #include ordering a bit more consistent
Not 100%, but a step forward.

Change-Id: I6957edbd24c1652b228a96a68424b857603aae45
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-03 09:18:10 +00:00
Alexis Jeandet
09eeab7737 Meson: partially clang-format all files
Change-Id: Ie621792417e89aa732311129f0cfa99a5147183a
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-03 07:24:17 +00:00
Thomas Hartmann
536bdef0c8 QmlDesigner.Rewriter: Fix regexp
Simply 'x' is a valid property.

Change-Id: Id18edeab60bbc45abcb9ae8937e0f4f4e938279c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-02 13:17:43 +00:00
Miikka Heikkinen
f166e18bfc QmlDesigner: Fix form editor occasionally failing to load content
It seems that form editor widget gets enabled when design mode is
opened, whether or not the form view is enabled. Therefore we need to
check the view's enable state in FormEditorWidget::showEvent rather
than widget's state to make the form editor content setup properly.

Change-Id: Ie865b98bb4c9f884f9297fe32fbf7ee02455e74e
Fixes: QDS-2926
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-02 12:55:35 +00:00