Commit Graph

66760 Commits

Author SHA1 Message Date
hjk
cc5ac00d19 ProjectExplorer: Make ArgumentsAspect's label text configurable
To be used in QmakeStep.

Change-Id: I5cc95de6b54c40a5dcc5f92768455a69a1d2869c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-06 15:26:51 +00:00
Thomas Hartmann
ebb4755753 QmlDesigner: Add customComponentSource to ItemLibraryEntry
Change-Id: Ief7555b321ae3bdc790b2e747d367347031a4a56
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-10-06 15:19:53 +00:00
Aleksei German
00c07ca53e QmlDesigner: MCU configurations metadata
-Removed c++ hardcoded info about QDS MCU restrictions
 -Instead replaced it with dynamically loaded qml files
 -Replaced QLists with QSet/QHash to improve performance

Task: QDS-2794

Change-Id: Ifc23d1299155001b6573dc0ed789dda5d2cfaf24
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-06 14:10:04 +00:00
hjk
ab76991286 QmakeProjectManager: Use LayoutBuilder for QmakeStep config widget
Towards aspectification.

This intentionally also removes the extra inner margin in the
widget as a side effect, increasing the similiarity with other
step widgets.

Change-Id: Ic315369479275a317441ff2c5abbec53695102f2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-06 12:59:26 +00:00
Eike Ziller
7c93f25ae9 CMake build: Fix issues with exported targets
Remove unneeded and wrong include paths which ended up as invalid
include paths in the exported QtCreatorTargets.cmake.

Add missing sqlite header.

Change-Id: Icce60037160ff06b032a03df47e6834422f86f57
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-06 11:08:59 +00:00
Eike Ziller
735078cd80 CMake build: Create shared lib for shared part of qmlpuppet
Which is used by external plugins.

Change-Id: I2d700c02ff3d4b2d692486bd64ef16449deffc4e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-06 10:16:55 +00:00
Eike Ziller
c3d461d494 CMake build: Add missing PROPERTIES to add_qtc_plugin
And use it for QmlDesigner

Change-Id: Id7221ee2288159ff2faaf4ac483570034927f1b4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-06 10:16:39 +00:00
The Qt Project
6335e1ce5d Merge "Merge remote-tracking branch 'origin/master' into 4.14" into 4.14 2020-10-06 08:27:11 +00:00
Eike Ziller
79f3b9f4f9 Add changes file for 4.14.0
Change-Id: I9ccf0134cf002d563c5b410005cfce058ef16614
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-06 08:25:18 +00:00
Eike Ziller
d323eeec52 Merge remote-tracking branch 'origin/master' into 4.14
Change-Id: I4b37b89cc1dd2c53217579ea554af0fb7994fa7e
2020-10-06 10:24:41 +02:00
hjk
a99127d73b QMakeProjectManager: Do not ask to rebuild too often
Due to the incomplete aspectification here, some of the connections
are set up in createConfigWidget(). Config widgets are created
and destroyed when the build configuration changes, and connections
that did not directly depend on the widget or subwidgets accumulated.

Use the the created widget as guard object to ensure connections
live only as long as the widget.

Task-number: QTCREATORBUG-24725
Change-Id: I4581f98e684ac92fd43ceba598d391c4dc8dbebe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-06 08:21:00 +00:00
hjk
2ecb7ceb06 Utils: Do not emit SelectionAspect::changed if nothing changed
Change-Id: Iac2e19d1a093f650ecde6fa9cfdec4714a8e9db4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-06 08:14:38 +00:00
hjk
97c6c13dcb ProjectExplorer: Remove BuildStepConfigWidget
After the previous changes it was only an empty wrapper around QWidget.

Change-Id: I58dcd82d8342c7de5e2df537044f6cf3de878a67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-06 08:06:39 +00:00
Eike Ziller
2092ebd074 Merge remote-tracking branch 'origin/4.14' into master
Change-Id: I4ea98cc1c14808afe44030a057f9ff289a57ccfe
2020-10-06 10:05:47 +02:00
David Schulz
3c281aa483 Editor: Select moved text after drag and drop
Fixes: QTCREATORBUG-24245
Change-Id: I9da52424128825f729d5d20e2c7fd095120477c6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-06 07:54:27 +00:00
The Qt Project
ab9efa7ec3 Merge "Merge remote-tracking branch 'origin/4.13' into 4.14" into 4.14 2020-10-06 07:50:30 +00:00
Christian Kandeler
90c757d9cc ProjectExplorer: Make build and run widget width persistent
... by storing the splitter state in the session.

Task-number: QTCREATORBUG-24690
Change-Id: Ifd27382cc61825f96de4fa5d4691b4f615448182
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-06 07:50:28 +00:00
Eike Ziller
87ad222cb6 Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: I3b48c76bbb456c487cec33383e7332b6a0a6752a
2020-10-06 09:49:57 +02:00
hjk
f08c3d150a Debugger: Fix parsing of octal-encoded gdb escapes
Fixes: QTCREATORBUG-24462
Change-Id: I89153a04eeef6a2e20fefef45e0efa3712ec0997
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-06 07:01:04 +00:00
Eike Ziller
430a9a03b7 Utils: Add workaround for sdktool
Which is compiled against an older Qt version to keep it more
compatible.

Change-Id: Ifee61a524055ca383c83da9f237e50536a3fd0cb
Reviewed-by: hjk <hjk@qt.io>
2020-10-06 06:14:53 +00:00
Christian Stenger
33c3fe2c67 Designer: Fix test
Amends 142c47bdc2.

Change-Id: I30ff356687d4daef93d35744fd8c108eafed0c68
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-06 04:03:47 +00:00
Assam Boudjelthia
ee3a0ecb75 Android: add qmake variables to completion assistant
Add Android specific qmake variables to profile completion
assistant.

Change-Id: I1c4c25bfa7481fed511f48360e93fb5996b42401
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-05 19:37:17 +00:00
Thomas Hartmann
3e4cb2ba2f QmlDesigner: Show selection in DebugView
Change-Id: Ica85a227e6976464480a3b3dd91d4d42f1ed1528
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-05 17:27:52 +00:00
Thomas Hartmann
b9cc9c9bfa QmlDesigner: Fix crash
We have to check if the view is actually detached.

Change-Id: I160c1a15f921092ef66999ed6a27ffcdbbe205d9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-05 17:27:45 +00:00
hjk
b2b35eeddc ProjectExplorer: ProcessParameters code cosmetics
Change-Id: I050cb30222642911b582b9936186719cb4f09fa1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-05 15:04:23 +00:00
hjk
ee5feb4939 Conan: Use Utils::Aspects in build step implementation
Task-number: QTCREATORBUG-21785
Change-Id: I5b2dbcc16a2504efe9fdc9e31fa2ef14bba7c33c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-10-05 14:36:55 +00:00
Thomas Hartmann
a53238e91c QmlDesigner.qml2puppet: Fix build with Qt6
Change-Id: If02714c44946d0a87a28c2ed505f860a593aef79
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 13:49:46 +00:00
Thomas Hartmann
469e7a7edf QmlDesigner.qml2puppet: Fix build with Qt6
Change-Id: Ib9580fa1b6c1699e830898234b286f3ee999d477
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 13:49:24 +00:00
Leena Miettinen
82d64ea49f Doc: Modify the terminology in the "Shapes" topic
Change-Id: Ibabca1fa03cc3c063ae066d0c8c8e79a1a3b25b0
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-05 13:41:32 +00:00
Thomas Hartmann
aeb30c0840 QmlDesigner: Delete existing node when property does not allow list
Some properties can only contain a single QML element. In this case
we should delete the old existing element.

This can be checked using NodeMetainfo::propertyIsListProperty.

Change-Id: I1782a38b7bfdb8a6f1078b0fa39654a4653dab59
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 12:32:26 +00:00
hjk
2a5c5d118b AutoTools: Build step code cosmetics
Change-Id: I5281bfaaa54ade80bbf46cfd16f629a2d1c81a9b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-05 11:26:44 +00:00
Christian Stenger
35ffc930b8 Tests: Fix QJson dumper test
Change-Id: Ic9f5b7da358164bb9b66f2c75965377cdbf09c4e
Reviewed-by: hjk <hjk@qt.io>
2020-10-05 11:18:45 +00:00
hjk
c3833406cc iOS: Remove unnecessary check in IosBuildStep::init()
A buildstep always belongs to a build configuration.

Change-Id: Ia24e571fbaf47c97797661774e87d583bddb1d76
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-05 10:22:58 +00:00
hjk
72c5477789 Utils: Remove SavedAction::m_settingsGroup
Instead, directly use the full key.

Change-Id: I8410851dd5d53f09f44cca66a9187d0b72717036
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-05 10:17:31 +00:00
Christian Stenger
bf19509642 Tests: Fix boost pro file additions
Otherwise we might end up with a messed up project
file.

Change-Id: I432d45063092d0a5dead3ef975ba3ce5294c1af0
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-05 10:02:14 +00:00
Thomas Hartmann
fe7d928f3b QmlDesigner: Do not keep separate selection state
When nodes are deleted the selection can changes without a notifier.
There is no reason to keep the selection separately.

Change-Id: I166d3695762e3d5cd6ff4808586384fd26bafef4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 09:37:11 +00:00
Thomas Hartmann
634bb8afb4 QmlDesigner: Add const to selectedModelNodes()
Otherwise we have to use qAsConst when using ranged for.

Change-Id: I6bb166be1525b0b75939c9a134b507e561f7bbd0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 09:32:34 +00:00
hjk
5d889a4d33 QmakeProjectManager: Add a soft assert
Task-number: QTCREATORBUG-24683
Change-Id: I6c4780a3200eff7c371dd90bb0b441ce84d4b9cb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-05 09:15:31 +00:00
Jochen Seemann
3a4ede2e1b Add support for Conan package manager
Task-number: QTCREATORBUG-21785
Change-Id: I4b2dbcc16a2504efe9fdc9e31fa2ef14bba7c33c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-05 09:10:53 +00:00
David Schulz
2842b613ed TextEditor: request assist after trigger char inserted
... while proposal is shown

amends 23d63dcc8b

Fixes: QTCREATORBUG-24225
Change-Id: Ie935c7c1d4786a4fd3cf338d7f1df52ae28de63b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-05 09:05:25 +00:00
hjk
fcaa6801cf Utils: Start replacing SavedActions by QAction or Utils::Aspect
First mechanical step here is to derive SavedActions from BaseAspect
instead of QAction.

Change-Id: I2ec95883b825462c1d867f83cc2b3bd2c2732055
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-05 08:46:27 +00:00
hjk
f4beb6314c Utils: Add some function to StringAspect
- enable/disable the widgets
- enable/disable text edit undo/redo
- possibly validate line edit input

Change-Id: I1933a0f03404de7dcd66475f20d9b7d884ef277e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-05 08:36:38 +00:00
Thomas Hartmann
e4b9ad289f QmlDesigner: Add QtQml.Component as component type
Change-Id: Ief07ffc863de978b6082adfec3477b00a7309654
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-05 08:25:48 +00:00
hjk
b97b7dc6f2 ProjectExplorer: Move BuildStepWidget::summary etc to BuildStep
The step is the source of information anyway, and available at the
only place of use. No need to copy that over to the widget, neither
for keeping it up-to-date there when the mechanism is already
available in the step itself.

This creates quite some potential for the simplification of
the various createConfigWidget implementations in follow-up patches.

Change-Id: I4474665f194a1ff7c5792ad086ed53c8d3ce13e6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-05 08:16:51 +00:00
Leena Miettinen
7c1971e908 Doc: Point to the online docs from README.md
To advertise the docs on GitHub.

Task-number: QTCREATORBUG-21179
Change-Id: I39bac5cfb8f9749966c3b879b0a89c4e62d934f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-05 07:56:16 +00:00
Eike Ziller
ad7dbc4619 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I565a0bd783dc80b53d4715fdc153dba1f1d3f7c7
2020-10-05 09:05:23 +02:00
Orgad Shaneh
48c56416f5 Git: Do not prompt to add files in a submodule
Fixes: QTCREATORBUG-23845
Change-Id: Ibf20eed26469b5a8599927e5ac2d458bbff9a156
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-10-04 17:06:23 +00:00
Fawzi Mohamed
2f584585e3 qmldesigner: Avoid crash of TextToModelMerger::getQMLSingletons()
When m_scopeChain is invalid (due to an invalid ui file)
getQMLSingletons would trigger a crash. Catch this case
and return early (an error message would then be displayed).

Fixes: QTCREATORBUG-24587
Change-Id: I80c70d8e7f1c88b14c53d3daebf957dc1e6089ee
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-03 19:33:46 +00:00
Ville Voutilainen
2e39132deb Android: Set the manifest dirty when app icons are set or removed
Task-number: QTCREATORBUG-24700
Change-Id: I862b5a17f47c7c6bbf7900b8923a246b8e902190
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-10-02 16:05:06 +00:00
hjk
c0b001737c ProjectExplorer: Remove BuildStepConfigWidget::m_step
It's not needed centrally anymore.

Keep it in the only remaining user, QbsBuildStepConfigWidget. Also
there it will not be needed after aspectification anymore.

Change-Id: Ia29e1e1f5226832ecb62ca79675ce717c9e5ef9a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-02 15:53:30 +00:00