Commit Graph

67787 Commits

Author SHA1 Message Date
Christian Stenger
e65e4b81ea QmlDesigner: Fix build of tests
Amends b0c47267d8.

Change-Id: I62c8007156a0f9cebdcc83c2f4cef135e19d27e2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-09-01 09:44:48 +00:00
Thomas Hartmann
71202abcbc QmlDesigner: Do not show items not available fot QtForMCU
Change-Id: Ia61634a5108db51b49241fd58b73ab71e9e5e2e8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 09:19:12 +00:00
Marco Bubke
b0c47267d8 QmlDesigner: Inline vector stream operators
Task-number: QTCREATORBUG-24548
Change-Id: I01d1b6e12c04c4ea47279e3a5046a0d3e34a5c09
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 09:10:19 +00:00
Henning Gruendl
1bc03df197 QmlDesigner: Fix indirect connection targets
Fix ConnectionView ComboBox to also include connection targets for
alias and custom properties in inherited external components.

Change-Id: Ic130adebef9de93efef5d2ed61178fed45242cb7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 08:36:14 +00:00
Alessandro Portale
947392cde9 VariableChooser: Avoid null pointer access
The code makes an effort to qobject_cast a pointer and check it, yet it
accesses another pointer to do its thing.

If the currentWidget is a QPlainTextEdit, this simply crashes.

Amends: da3b83589b

Change-Id: Ie79fa233b04c392fd5aa72cd512fcd0f0d829659
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-01 06:12:07 +00:00
Thomas Hartmann
25f978a089 QmlDesigner: Update StudioWelcome tutorials
Change-Id: Ic5053eee4df2fa559b18fc77330b7837c146e2ff
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-31 14:08:39 +00:00
Eike Ziller
6477a07654 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangtools/virtualfilesystemoverlay.h
	src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui
	src/plugins/qmldesigner/designercore/model/abstractview.cpp

Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
2020-08-31 14:49:19 +02:00
Venugopal Shivashankar
e8eafd85ee Doc: Update the MCU options dialog screenshot
Also, fix the broken link to the Qt for MCUs
supported platforms page.

Change-Id: If0a0702b0821e2e46eca2ad57676c53cb20040e2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-31 11:28:42 +00:00
hjk
b5e2485fbf Debugger: Compile manual test with Qt 6
Task-number: 24098
Change-Id: I9fdaf913a0ed2017460ba8d4f63c94a1d62b0062
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-31 10:46:14 +00:00
Denis Shienkov
17d8f18d46 Debugger: Implement 'show memory' feature for UVSC engine
This commit implements a possibility to open the memory viewer/editor
for the specified address.

Take into account that it is impossible to open a memory viewer/editor
for a specific local variable or a stack, because the UVSC engine
does not provide an addresses for a local variables.

Change-Id: Ib65a9f9ba2534283c7e3404bc66785767c926053
Reviewed-by: hjk <hjk@qt.io>
2020-08-31 10:14:06 +00:00
Christian Stenger
5ddd83247c Incredibuild: Fix handling of build commands
The default command is supposed to be a placeholder not
an entry done by the user.
Allow entering an empty string again to rely on the default.
As on it fix place holders inside strings.
Amends e04b9a5348.

Change-Id: I111c843d9620ecc8cf5a7a3c63ca7ac92e588e0c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-08-31 09:56:13 +00:00
Vikas Pachdha
48bfe882e0 AssetExport: Export the metadata oustside the project directory
Name the metadata file after the project being exported

Task-number: QDS-2612
Change-Id: Ia073f6969708f2ed89552dfc7a38305563e2bef2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-31 09:30:09 +00:00
Christian Kandeler
f1062f1366 CPlusPlus: Dissolve some overloads of FindUsages::reportResult()
These overloads did not add any value, but were just confusing.

Change-Id: Icf3f69a30e2fccc4a4695e79bcf32457b2fb481b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-31 09:17:53 +00:00
Christian Kandeler
81b4e63bda WinRt: Fix BuildStep soft assert
Change-Id: Iee7290796737b629c7241ef441099a449f0fae5c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-08-31 09:16:04 +00:00
Christian Kandeler
1652396ece CppTools: Fix CppSelectionChanger autotest
... on Windows.
We need to open the test file in text mode. Otherwise the raw string
literal will contain carriage returns. As these get dropped by
QTextDocument, the offsets will be inconsistent with the ones reported by
the tokens, causing the test to fail.

Change-Id: I161a3f5791c33416ff732f90fd615cf39d8152ce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-31 09:15:50 +00:00
Miikka Heikkinen
29ca7de368 QmlDesigner: Reset puppet after removing SLConnector
Changing imports resets the puppet before SLConnector gets removed,
causing puppet load to fail. Added additional resetPuppet call after
SLConnector removal to ensure puppet is loaded correctly.

Change-Id: Ia26bbcbd39fe4c59a4795fa0052d0adedac789b7
Fixes: QDS-2662
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-31 09:12:14 +00:00
Henning Gruendl
431667925e QmlDesigner: Update StateEditor layout
* Add alias properties to StudioControls AbstractButton
* Add color to StudioControls theme
* Update StateEditor layout due to issue with default label placement

Task-number: QDS-2623
Task-number: QDS-2615
Change-Id: If46daab2293d42dff7d73c4cf9a0c370442c5694
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-31 07:53:05 +00:00
hjk
72406c69ce QmlDesigner: More compile with namespaced Qt
Amends 4886375994. Compiles for me without.

Change-Id: Iaccbe6a2000d1b87008496f0e515a94aa7955061
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-31 07:06:20 +00:00
hjk
a981df3bf6 More namespaced Qt
Amends b41ea23233.

Missed that because the file is gone in master.

Task-number: QTCREATORBUG-24544
Change-Id: I7e5948d564c370f9ed197d999778151f2fe61b38
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-31 07:06:14 +00:00
hjk
b3652da3ac Nim: Inline nimcompilerbuildstepconfigwidget.*
Step towards aspectification. The new position of the method
implementation are intentional to keep the follow-up patch small.

Change-Id: I89c6982c8380c2a6b0e2bc50fb10f48d5413fc51
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-31 06:38:40 +00:00
Orgad Shaneh
53c763029b Dumper: Fix size of refcount member in basic_string
It's an int. Still, the position is 3 pointer-sizes back due to padding
(the next member after this struct is the char pointer).

The pointer-size + bitwise stripping of the LSB probably doesn't work
on big-endian archs.

Change-Id: I4413d9b32986d1ea0be9abe1be4382ee36a9456c
Reviewed-by: hjk <hjk@qt.io>
2020-08-30 10:10:51 +00:00
Thomas Hartmann
688f78552d QmlDesigner: Update properties supported by MCU
The transform properties are only available for Image and  Text.

Task-number: QDS-2512
Change-Id: I7c3eb6cb07182afe1e9d307bb5d210f1f2cf9c9f
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-29 10:41:56 +00:00
Thomas Hartmann
024eeee745 QmlDesigner: Enable Timeline for MCU, but blacklist FlowView
Task-number: QDS-2681
Change-Id: I1b4eb312ce88e1ee7bf052020fd4e9d5cf95021c
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-29 10:41:44 +00:00
hjk
cef1297504 Meson: Fully inline MesonBuildStepWidget
Next step in aspectification.

Change-Id: I9718d7ca763008fa040371d5b863b8604901adb7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-28 14:19:10 +00:00
Miikka Heikkinen
ee281afa73 QmlDesigner: Support dragging images to TextureInputs
Dragging an image to TextureInput item creates a new Texture item at
the same level as the TextureInput and binds TextureInput.texture
property to the newly created texture. Any existing texture binding
is overwritten.

Task-number: QDS-2657
Change-Id: I79cf1a11608914ded4b868336a7d1a9c83071d87
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-28 14:01:14 +00:00
Christian Stenger
2f6d0a1ad3 QmlDesigner: Fix compile of tests
Change-Id: If791e1e2eb7c9b4d04c13ecd5db531abef9069fa
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-28 13:49:17 +00:00
Venugopal Shivashankar
5ac01be934 Doc: Drop BareMetal from the requirements list
In addition, drop the instructions to enable
or disable a plugin. It is already documented
else where and is less relevant in this
context.

Fixes: QTCREATORBUG-24531
Change-Id: Icd1f46333e1d1f64ff24ab0b2eb1e571d533e5ed
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-28 13:37:30 +00:00
Leena Miettinen
6181399187 Doc: Use local value for \QMLD macro in Qt Design Studio Manual
This enables us to get rid of the product name "Qt Quick Designer"
in Qt Design Studio context. However, the macro can no longer be
used for UI text. Actually, it does not make much sense, because the
UI text is not dynamic. It would be good to also replace it in the
UI with something more generic, or with "Form Editor", for example.

Change-Id: I5884f090f915d5ff0c64428239bfd324cd1941c2
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-28 10:06:06 +00:00
Orgad Shaneh
b55cc28264 LLDB: Append 2 newlines after commands
For some reason, sometimes LLDB misses the first character of the next
command on Windows.

Task-number: QTCREATORBUG-14539
Change-Id: Ide78e0a0aa64ea4cbcaf6b55a0acdd548a1fa46c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-28 09:24:01 +00:00
David Schulz
472cae1823 ClangTools: Fix soft assert when no clang tool can be detected
When no clang include dir or version can be detected the runner
does not contain a valid executable so skip that runner.

Change-Id: Ia1b664b65ac4a9d80042d77dfb5b8842ec06dcea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-28 09:16:34 +00:00
hjk
b41ea23233 Meson: Compile fix for namespaced Qt
Task-number: QTCREATORBUG-24544
Change-Id: I5a6ff7f561aca0b967471f4532e32a05077e3939
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-28 09:09:46 +00:00
hjk
4886375994 QmlDesigner: Fix compilation with namespaced Qt
Task-number: QTCREATORBUG-24544
Change-Id: I9f16bf9a454f5b97ac6581274b0b08421b24c4da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-28 09:09:32 +00:00
Christian Stenger
d6ce25903d Utils: Validate pathchooser on setting default value
When changing the default value we may also change the current
state of validity, so trigger a validation immediately.
Amends b938764820.

Change-Id: I99bce422d3a0aa2b6418495b4a2c69255df06674
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-28 09:01:52 +00:00
David Schulz
89c8fbf676 ClangTools: fix compile
Change-Id: I2f92a9892baee52d9e64f02dc20c3085001a4783
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-28 08:59:38 +00:00
Christian Kandeler
25ab750e3a qmake: Prevent injection of empty values via environment variables
The qmake $() operator retrieves environment values at make time. In Qt
Creator, we still use these values for feeding the code model,
presumably because the qmake and make step share a common environment.
However, we must take care that unset environment values do not lead to
empty strings in qmake lists, as that can have unwanted side effects,
especially when these lists get turned into command line arguments that
are passed to build tools.
A concrete example: A project file contained the following assignment:
    QMAKE_CXXFLAGS += $(SOME_VAR)
SOME_VAR was not set in the environment, so an additional empty argument
appeared on the command line when the code model called the MSVC
compiler to retrieve some information required for parsing the code. The
call failed, the code model had to fall back to default values, and the
user got parsing errors.

Fixes: QTCREATORBUG-21729
Change-Id: I224369a2fb9c0dd78406253edba03bd44556be44
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-28 08:50:23 +00:00
Eike Ziller
cfebe5a9da Complete documentation on IDocument
Change-Id: I72a62beaf6c8de0d2ae39a1c3c833708ca27b03f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-28 08:46:23 +00:00
hjk
30c55c063d Help/Android: Compile with namespaced Qt
Task-number: QTCREATORBUG-24544
Change-Id: Id06cc623b8a0bfe365dda928cda52a97321732b2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-28 07:59:15 +00:00
Miikka Heikkinen
f69ce702af QmlDesigner: Handle shaders and commands dragged to passes
Quick3D shaders and commands dragged to passes from item library will
be automatically added to corresponding property, too. The shader or
command is also moved to the same level as the pass as passes can't
have child nodes.

Task-number: QDS-2657
Change-Id: Id7efc302b06703ddd669b679b65d3adc9ecb48de
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-28 07:40:41 +00:00
David Schulz
e176958da1 ClangTools: Add automatic clang tool runner for open documents
Fixes: QTCREATORBUG-23349
Change-Id: I81197180c9d69c7df6184f8fcbf05f2256eaf7f6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-28 07:20:32 +00:00
David Schulz
7f562c4d33 ClangTools: Add diagnostic mark class
These marks can now be disabled.
This greys out the annotation color and the icon of the mark.

Change-Id: I5af4591db4baaaef55c986252f77d5d977427b56
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-28 07:20:19 +00:00
Aleksei German
ae0b98a32a QmlDesigner: Fix for States compilation break
Fixing compilation break in StatesEditorView:
 QtCreator is build with 5.12
 QScopeGuard is from 5.14+
 Replaced scope guard with unique_ptr

original task: QDS-2312

Change-Id: Id6a4bf513f37675044b073be2dfe52e3fa9dc3bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-28 06:48:12 +00:00
Aleksei German
61b21b0a2f QmlDesigner: Fix for RichTextEditor Qt Version
Original task: QDS-2634

Change-Id: I7edc580aec36090e037c4520ad364a62427df9f0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-28 06:48:02 +00:00
hjk
4314795992 Help: Replace Qt::MidButton by Qt::MiddleButton
Task-number: QTCREATORBUG-24098
Change-Id: I46e06ec1402be345ebd1e4543ed67a726caa42a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-28 05:50:50 +00:00
Christian Kandeler
a79b0c6558 C++: Offer only signals when completing in a connect() call
... at the second argument.
The logic is as follows: The clang code model checks whether the set of
completions contains any signals. If so, it instructs the built-in code
model to analyze the AST to find out whether the completion location was
at the second argument of a call to QObject::connect(). In that case, we
filter out all non-signals, because they are not valid at that location.

Fixes: QTCREATORBUG-13558
Change-Id: I9c7d0bd16161c723aef822280626cd06ece7df93
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-27 14:02:51 +00:00
Miikka Heikkinen
3fd9110233 QmlDesigner: Allow image drag to create Texture on all materials
Dragging image asset to any 3D material type now creates a Texture out
of the image. Default materials assign the created Texture to
a diffuse map and principled materials assign it to base color map.
Custom material just creates the Texture without any assignments.

Task-number: QDS-2657
Change-Id: I065f98cbc4d8c3293fbacea9ef8649d0a2edfb0a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 13:43:26 +00:00
Leena Miettinen
8702f58a03 Doc: Update info about binding and connection editor
Change-Id: I95a77b700db341bb5e63a2052396904598b16dea
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:29:15 +00:00
Henning Gruendl
5a8d4c6fc1 QmlDesigner: Update icon font
* Update icon font
* Use newly added icons in EditableListView

Change-Id: Ia21c2120c54c41cd00dca07622ced98a0bf7f7f0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:06:04 +00:00
Aleksei German
f642c02eb6 QmlDesigner: Annotations for States
- Added Annotations support for States

Task: QDS-2312

Change-Id: I204ec958f85bd0f05eae0abbb3848d6d59e7e397
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-08-27 10:05:44 +00:00
Henning Gruendl
ac5d35a53d QmlDesigner: Remove parent as Connections target
Task-number: QDS-2651
Change-Id: Ib4520206cc2a3f8a044a66e3e01db0ec603a3029
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:05:26 +00:00
Henning Gruendl
d235a6d807 QmlDesigner: Fix focus on EditableListView
* Add an enum to the StudioControls ComboBox to indicate type of
  interaction
* Force focus on last used ComboBox if activated signal wasn't send
  due to editing of the ComboBoxInput

Task-number: QDS-2626
Change-Id: I20b1660a05923baacef30f91080642baacee0378
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:05:04 +00:00