Commit Graph

47434 Commits

Author SHA1 Message Date
Thomas Hartmann
2f77a9bcfc QmlDesigner: Fix crash
Change-Id: Ibb6a14b4b684482b8c6098933a79929c2bd09add
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-04 08:40:11 +00:00
Christian Stenger
f9600b7335 CMakePM: Fix removing cmake tools
The id might be destroyed with its parent before trying to
reference it again and put it into the list.

Change-Id: Ic7bb053293b24f0f0109a1c6479f73b7cbec2dc0
Reviewed-by: hjk <hjk@qt.io>
2020-09-04 04:32:49 +00:00
Aleksei German
f849319d11 QmlDesigner: Disable more properties for QUL
Turned off Controls properties and Animations.

Task-number: QDS-943
Change-Id: I4b9868734c74f5319fd7d3e66b57d59007300340
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-03 16:17:52 +00:00
Tasuku Suzuki
367d0dc4f7 Improve git archive userbility
Archive should be saved at one level upper directory from repo dir.
When user change archive name to e.g. project-v1.0, Qt Creator saves it
to project-v1.tar.gz now. It should be project-v1.0.tar.gz

Change-Id: Ibcd3c6bd8413bbb28fcdae13e5eb43016dc2b6a3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-03 15:34:14 +00:00
Christian Kandeler
45dd074441 CPlusPlus: Categorize "Find Usages" results
That is, find out whether a certain access was a read, a write, a
declaration or something else, and report the result to upper layers.
Follow-up patches can make this information visible to users.

Task-number: QTCREATORBUG-12734
Task-number: QTCREATORBUG-19373
Change-Id: Iee79e39dd1eb5a986a7e27846991e0e01b2c3a2f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-03 14:32:47 +00:00
Eike Ziller
05b92b4df9 Fix build of Clang refactoring plugin
Change-Id: Idfdde4b517aa24ea7becbbd67c34bb818a2a0f52
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-03 10:45:30 +00:00
Eike Ziller
3b76714290 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml

Change-Id: Ie5deacd39ae4f3c0966e7cb41a8fd832dcefbb09
2020-09-03 12:18:02 +02:00
Aleksei German
b11bfd5652 QmlDesigner: Disable more properties for QUL
Disabling more items in ItemLibrary and properties

Change-Id: Ib019c1cbe356e0f7e3889d3500c080b0f5756c34
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-03 08:39:26 +00:00
hjk
5b8846a4f8 Nim: Rework NimCompilerBuildStep
Use new ProjectExplorer infrastructure.

Change-Id: Id8fed337895f9f18fec44f4756493f40ea07f3da
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-03 08:10:47 +00:00
Orgad Shaneh
a408bcfd3d Clang: Add conditions for adding exceptions flag
For GCC it can be deduced from the compiler flags, so no correction is
needed.

For MSVC it can be deduced from the detected defines.

Amends 26693e8212.

Change-Id: Ie4850f328a2afdb3e5158c58f8c30a2644d9c592
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-02 15:26:19 +00:00
hjk
fc1fc6a07a Qmake: Inline QmakeBuildStepWidget
That's mostly mechanical, except the summary updating part, which
was triggered rather extensively before and is now split into the
actual summary update, and updates related to abi list changes.

Change-Id: I1b691327fcc1d2437d96e893e910a1c65e321506
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-02 12:40:47 +00:00
Thomas Hartmann
49902aecd3 QmlDesigner: Add support for .hdr images
Task-number: QDS-2128
Change-Id: I840d808adb68a7439c0d1ea06f71e20ad53c00e9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-02 10:29:18 +00:00
Thomas Hartmann
8259c1e0e7 QmlDesigner: Disable FlowTags for MCU
Change-Id: I708dad46d92c48991a603819313ce148eccc3b54
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-02 10:02:33 +00:00
hjk
f450c369a3 iOS: Remove redundant IosBuildStep::m_clean
This was determined and fixed at step creation time. There is
also no way a step can morph its "cleanliness", so there's no
need to persist that either.

Change-Id: I4c49aaee2cf00b6d428a8e4a213f1f072a01f57b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-02 09:57:27 +00:00
Ville Voutilainen
fdedd9570b Android: Don't require arguments for a service
Task-number: QTCREATORBUG-24557
Change-Id: Ifc1c9c5c2fcfaba48e043e4334fb019efa611f39
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-09-02 07:27:32 +00:00
hjk
912fd4a1b3 iOS: Inline IosBuildStepConfigWidget
Also clean #includes.

Change-Id: I105edb5f0505545a371db6944831a96b3e8db698
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-02 06:30:22 +00:00
Christian Stenger
b42f1bd764 Nim: Remove unused declaration
The implementation is gone for a while.

Change-Id: I79e79569b24b7af5ca5e3df0a245fa5dd0f8ef30
Reviewed-by: hjk <hjk@qt.io>
2020-09-02 06:01:34 +00:00
Christian Stenger
17e0c2b044 Nim: Fix building with nimble
Do not expect nimble to be in PATH, but assume it is
located where nim resides. Use kit's information of
nim to construct the nimble path and add the path of
nim explicitly to the build environment as nimble
uses it.
Also fixes running nimble test.

Change-Id: If7be425f7b811486afe39fc1618709dbb2f75ac9
Reviewed-by: hjk <hjk@qt.io>
2020-09-02 06:01:27 +00:00
Thomas Hartmann
ca88afbe31 QmlDesigner: Update complete scene
This removes painting artefacts, since
the bounding rectangle also gets smaller when updated.

Change-Id: Ic184cadbd1dbda1952012b749eadfde0da57ef7f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 15:49:59 +00:00
Vikas Pachdha
1b19ae28db AssetExport: Do not export states, timeline and connection nodes
Nodes of type QtQuick.Item should only be exported

Task-number: QDS-2667
Change-Id: I099b2d1d2a14ded5de46c2852306d5825a89034a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 15:17:57 +00:00
Vikas Pachdha
727f25fbd6 AssetExport: Fix incorrect Node lineage
Task-number: QDS-2667
Change-Id: I50bd4fbd093734d2df35fce8aed57af28469d358
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 15:17:44 +00:00
Aleksei German
dcefa9cd43 QmlDesigner: Change CoffeeMachine startup file
Task: QDS-2690

Change-Id: I7ab7a596bf940903c3feb3fbff5324fbd64f16bf
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 13:57:05 +00:00
Mahmoud Badri
88e5a6200b QmlDesigner: Make active3dScene internal (not saveable)
Task-number: QDS-2699
Change-Id: I7c8e8245c7f4631a7f3cac121ed9a88e3395f579
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 13:55:29 +00:00
Thomas Hartmann
c46ca844fc QmlDesigner: Fix for macOS issue
Task-number: QDS-2708
Change-Id: If7a2f850b9ada74f590574214f7bd1384e3f67e0
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 13:53:59 +00:00
Alessandro Portale
bbbb7d421b McuSupport: Use platform specific case for referencing "Path" value
... in the build environment of the generated Kit.

Change-Id: Ia0b8f8dba03a9a91c8435a3b2a4a1410f3459da8
Reviewed-by: hjk <hjk@qt.io>
2020-09-01 11:23:54 +00:00
Alessandro Portale
4e1434d51a McuSupport: Grant kits a Qt version on non Windows host
The qul libraries for the Desktop Backend are statically linked against
Qt on Windows. Also, the qul host tools are shipped with the Qt runtime
libraries (on Windows).

Not so on Linux, so a Qt version is required, there.

Change-Id: Id49ed2ef01926abc71291751eae03263317a56d4
Reviewed-by: hjk <hjk@qt.io>
2020-09-01 11:23:48 +00:00
Vikas Pachdha
4473769bc4 AssetExport: Notify QML parsing errors
QML can not be exported if the document have parsing errors

Task-number: QDS-2667
Change-Id: I22075789cfa5853b1607c45e2b49bb761836c0d6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-01 11:07:16 +00:00
Aleksei German
f43b81ae6f QmlDesigner: Disable Properties unavailable in QUL
Disabling properties in:
 MouseArea
 Flickable
 Image
 Text (including Font)

Change-Id: Id0a44fa73ff80bf4749c0bdc0f9eac3e2f488762
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 10:03:53 +00:00
hjk
b9afd77e96 iOS: Inline IosDsymBuildStepWidget
Change-Id: Ie14377dd5057d7def2366f0110838626a2f4ea29
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-01 09:56:09 +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
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
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
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
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
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
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
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