Commit Graph

6459 Commits

Author SHA1 Message Date
Thomas Hartmann
8910601b78 QmlDesigner: Allow creation without version number
Task-number: QDS-4403
Change-Id: I952de9a2a6aa345b041f890fb2d364850c25e492
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-06-01 10:44:18 +00:00
Miikka Heikkinen
f913a65405 QmlPuppet: Support multiselection transformations in 3D edit view
Add support for moving, rotating, and scaling a multiselection of 3D
nodes in 3D edit view.

Fixes: QDS-4313
Change-Id: Icf83911ac6f87fde1cb79d6f5059ae01ed434d7f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-01 09:38:00 +00:00
Miina Puuronen
6caa8cc289 QmlDesigner: Fix Component Library header
Hover was not working on LibraryHeader.qml. There seems to be some issues
between QQuickWidget and QML Item. Header width and height are now set with
m_headerWidget instead of root Item.

Fixes: QDS-4387
Change-Id: Ic587be319bb7aa6755fa26f6211ce11eb9795c67
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-05-31 10:25:55 +00:00
Mahmoud Badri
4786b03594 Implement new Assets library
Build a new Qml based item library assets view.

Task-number: QDS-3590
Change-Id: Ib3a4bcac8f873469ec5f3429817c49f466ec1e2a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-27 13:55:51 +00:00
Miikka Heikkinen
125cdcc3a0 QmlDesigner: Block changing eulerRotation for 3D Node that has rotation
QtQuick3D doesn't support both rotation and eulerRotation set on same
node, so we delete existing quaternion rotation if user sets an euler
rotation to the node. If node has quaternion rotation animation,
we block any change to eulerRotation in the node.

3D editor also disables the rotation gizmo for blocked nodes.

Task-number: QDS-4335
Change-Id: I4ce7b022c732a9547751f101548ecea948279db8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-27 08:43:50 +00:00
Pekka Kaikkonen
b709f3115b QmlDesigner: Style properties formatting operations
User can copy properties of an item (for example text, rectangle,
positioner etc.) and paste them to the similar item using format
operations.
Available properties and item categories can be configured using
formatconfiguration.json file.

Task-number: QDS-2231
Change-Id: Idd574418451809c84bca2bd8a7ab6045043bde58
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-26 11:05:07 +00:00
Henning Gruendl
6884086115 QmlDesigner: Update icon font
* Add bevelAll, bevelCorner, copyStyle, cornerA, cornerB, cornersAll,
  eyeDropper, gradient, keyframe, linkTriangle, linked, mirror,
  paddingEdge, paddingFrame, pasteStyle, promote, transparent, unLinked
* Rename aliasProperty to alias

Change-Id: I2050c765fe242a68054b2c8c2ff9c3f778c06423
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-26 10:52:09 +00:00
hjk
925c49a1f1 Debugger: Adapt Utils::FilePath dumper to recent change
Change-Id: I0c21fe0bc795a24ce6b61d739f221f28cefc6df2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-25 08:30:46 +00:00
Miina Puuronen
2c8a9a6761 QmlDesigner: Fix showing Component Library module context menu
The context menu for modules and categories was not working properly
during search. The menu is now disabled whenever the search is
ongoing, as it's unnecessary to show it at that time.

Fixes: QDS-4230
Change-Id: If0465f973188d199982e87e765fbfe1efb641bb7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-05-20 10:00:41 +00:00
Eike Ziller
f83be6debe Merge remote-tracking branch 'origin/4.15'
Change-Id: Ia6558fc2423fd9cd84ca2282bfa60d102dff682e
2021-05-19 09:54:07 +02:00
Christian Stenger
2e24d4b0cc Wizards: Fix generation of dynamically populated models
This was implemented for QAbstractItemModel based classes, but
forgotten for QAbstractListModel and QAbstractTableModel based
classes.

Change-Id: I807f445e48d2906580abd0a65bb794d6e766c1a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-18 09:41:11 +00:00
Eike Ziller
b87c3cc03e Fix Qt Creator plugin wizard's GitHub action
for the changed location of build_plugin.py

Fixes: QTCREATORBUG-25727
Change-Id: I6bda26b1820b86ac4cf12a55821eed879ee818bc
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-18 07:27:49 +00:00
Miikka Heikkinen
1608fa5265 QmlPuppet: Fix warning about extra argument to function call
MouseArea3D::applyFreeRotation only takes four arguments, so remove
the unused _targetPosOnScreen property.

Change-Id: I10940f6954de89cb7a01bdbea6a0a55e69cb9c65
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-05-17 09:20:12 +00:00
Eike Ziller
3823b0af5f Merge remote-tracking branch 'origin/4.15'
Conflicts:
	src/libs/languageserverprotocol/workspace.cpp
	src/libs/languageserverprotocol/workspace.h

Change-Id: I739ae6642b1e2a505e351903f19df2550ef01629
2021-05-12 15:27:30 +02:00
Miikka Heikkinen
9f33f76a97 QmlPuppet: Fix crash when editing importing 3D component
Fixes: QDS-4334
Change-Id: I03c79ae7e51d6821823e19d813eba483ec5981c7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-05-10 12:46:26 +00:00
Eike Ziller
6bb918adab Merge remote-tracking branch 'origin/4.15'
Change-Id: Ic839ab43a723ab22cc83e5b0d823ec6121cb6701
2021-05-10 13:50:58 +02:00
Kai Köhne
1e80ed9b78 Qt Quick Wizards: Remove Qt versions older than Qt 5.12
That doesn't mean we don't support older versions. But I don't think
we should advertise creating new projects for it.

Change-Id: Ia9b97cc072232238baffd10b159f604f1a6413d1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-07 13:18:41 +00:00
Eike Ziller
bf5b1d714c Revert "Revert "Merge remote-tracking branch 'origin/4.15'""
This reverts commit f0a86d4510.

Reverting a merge doesn't "undo" it - the changes would be lost
forever even with subsequent merges.
So we need to revert the revert to get the changes.

Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-05-07 09:07:40 +00:00
Christian Stenger
03624f9a68 Debugger: Do not omit original stack
..if loading the qml stack failed, e.g. when using a Qt
without debug information.

Task-number: QTCREATORBUG-25554
Change-Id: Ibe2a051f4dc0a9d3c15a63f663f5934a476d6fc4
Reviewed-by: hjk <hjk@qt.io>
2021-05-07 04:21:21 +00:00
Marco Bubke
f0a86d4510 Revert "Merge remote-tracking branch 'origin/4.15'"
This reverts commit 888ca0dd20.

Reason for revert: wrong patchset

Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-05-06 15:30:02 +00:00
Kai Köhne
53c0b82a93 Add "Minimal required Qt version: Qt 6" option to QQ application wizards
Provide a Qt 6 option that does not use any versioned imports.

Also make Qt 5.15 the new default.

Fixes: QTCREATORBUG-24973
Change-Id: I43714e5e344d1d91d35c5ad298edf28bc32ff7d6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-06 15:00:24 +00:00
The Qt Project
84c37d5c27 Merge "Merge remote-tracking branch 'origin/4.15'" 2021-05-06 14:10:24 +00:00
hjk
75ededf4a9 Debugger: Implement "Load QML Stack" feature for LLDB
Fixes: QTCREATORBUG-25554
Change-Id: Ieafa22581c294d9b993efe077354750a8f986424
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-06 14:07:12 +00:00
Mitch Curtis
357e70279c Update usages of Qt Quick Controls 2 styles
The Default style was renamed to Basic
(9219e86aa571d8b2f5da1ec92a461e5add38f57c) and we now default to a
platform-specific style (8b534487044dfb3b464431ecb91ef4e0864af4ed) if
available.

Task-number: QTBUG-85984
Task-number: QTBUG-86403
Change-Id: I66d2188a0c45605abdbbd8c71396b16407166d75
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 12:39:32 +00:00
Tim Jenssen
888ca0dd20 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	src/libs/sqlite/sqlitebasestatement.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I0fa0a8a7feffed24c0d2bc26eca86590f1156755
2021-05-06 13:07:48 +02:00
Tim Jenssen
fb26650d86 QmlPuppet: fix crash when multilanguage database is used
amends 81a36ac0ef

Change-Id: Ib4143432704569c84a57540a07f75fa2044aaf0e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-05-06 09:01:43 +00:00
Tim Jenssen
97a9327746 QmlPuppet: reorder includes
Change-Id: If73f76aee81feef160feeb87c78644e26e36072d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-05-06 09:00:49 +00:00
Thomas Hartmann
0059f6af74 QmlDesigner: Define RegExpValidator in HelperWidgets
In Qt 6 there is no RegExpValidator anymore.
To support both Qt 5 and Qt 6 we register our own RegExpValidator
in HelperWidgets if we compile with Qt 6.

Change-Id: I7e66cbf3e29dd034a1c96a22e233058cb7a892e3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 08:33:33 +00:00
Thomas Hartmann
8bfdb39d71 QmlDesigner: Fix InternalConstants for Qt 6
Change-Id: I1f516b4d350c88154dfe193d0833b28b1b46c7e2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 08:33:23 +00:00
Eike Ziller
b3a893e9b8 Merge remote-tracking branch 'origin/4.15'
Change-Id: I75ffc79eeb8d73296a2271a636fae48e35427947
2021-05-05 11:46:19 +02:00
Miikka Heikkinen
0a84406e0d QmlPuppet: Re-enable navigator preview image generation
The issue blocking this was fixed in QtQuick3D.

Change-Id: I31ceb3091f7deb4450c966a8c41a203782569f14
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-04 14:02:50 +00:00
Michael Weghorn
fd9ca07a11 Debugger: Import GDB pretty printers for new objfiles
Previously, if enabled in the configuration, system
GDB pretty printers were loaded only once for all
objfiles present at the point in time when the loading
happened, which meant that GDB pretty printers for
objfiles loaded later were not taken into account
and thus unavailable if they were defined in the
corresponding autoload scripts for the objfiles.

In order to make use of those as well, remember whether
loading of system GDB pretty printer is enabled, and if so,
evaluate the pretty printers set at the new objfiles
in the handler for GDB's new_objfile event.

Extract the functionality for handling one objfile's
pretty_printers to a separate function
'importPlainDumpersForObj' to avoid code duplication.

Note: For this to actually work, it is required that the
objfile passed to the registered GDB new_objfile handler
actually has the pretty printers set at this stage.
This was only recently implemented on GDB side, in
GDB commit 2c473def12b08100e6b56261f01112db7f6aeab5
("gdb: do autoload before notifying Python side in
new_objfile event", 2021-04-27, [1]).
Therefore, this currently only works with the current
development version of GDB built from its git master
branch, not with any already released GDB versions.
(When older GDB versions are used, this will just behave
as it used to, and the corresponding GDB pretty-printers
will not be used.)

[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=2c473def12b08100e6b56261f01112db7f6aeab5

Fixes: QTCREATORBUG-25339
Change-Id: Ibc0ab16fbb75184fa199c0709bfc73954f04c193
Reviewed-by: hjk <hjk@qt.io>
2021-05-04 13:30:51 +00:00
Eike Ziller
2fe1e881ac Merge remote-tracking branch 'origin/4.15'
Change-Id: I44dad4bbe9ed955d35c713485720a3f36a21874d
2021-04-26 11:59:13 +02:00
Miina Puuronen
5c2a95b035 QmlDesigner: Fix Component Library context-menu option disable state
Update the state of categories hide state property when removing a
module so that "Show All Hidden Categories" context menu option enable
state is updated after removing a module.

Fixes: QDS-4226
Change-Id: I7c963e92e6e94e28856a5e51f75ae618b3b684ec
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-04-23 13:14:51 +00:00
Eike Ziller
872660fcc5 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ibc60debb3c409ae27e99df6071cf6115b272d6d8
2021-04-15 15:48:30 +02:00
Aleksei German
241ff84e28 QmlDesigner: Update QDSMCU metadata
Change-Id: I29d07a91f117d18e0fbfbac3d5547a44ff8d932f
Fixes: QDS-4149
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-14 14:14:32 +00:00
Eike Ziller
555dbac851 Merge remote-tracking branch 'origin/4.15'
Change-Id: I613b60f7d5cfca19ed611b3777548738d7bd7d67
2021-04-14 11:33:16 +02:00
David Schulz
4f9ed8d620 Dumper: Fix qobject name dumping for Qt 5 again
Amends: e05fe66f4b

Change-Id: I244017a63216a6bbc89d9f211eec7d7def27beb4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-14 09:28:45 +00:00
Eike Ziller
2800f3b51f Merge remote-tracking branch 'origin/4.15'
Change-Id: I0afcf51d354ffd73a8f2956a7f78b1e4f032677b
2021-04-09 12:42:03 +02:00
Miina Puuronen
24d88de228 QmlDesigner: Implement hiding component library categories
Task-number: QDS-3822
Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-08 08:53:25 +00:00
Thomas Hartmann
c7d9ca1154 QmlDesigner: Fix Qt 6 imports
This allows using a Qt 5 puppet with simple Qt 6 files.

Change-Id: Ic3264ffbf8d798ff260305079a0bb281f9628795
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-06 16:45:32 +00:00
Eike Ziller
c0cfafdd3d Merge remote-tracking branch 'origin/4.15'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I403b236c40d73a61ae22304e289e9d4374366395
2021-04-06 15:17:40 +02:00
Eike Ziller
4b3a746332 CMake build: Fix remaining issues with Devel package
On Linux (and Windows) we should not create toplevel files (README.md
etc) or directories (doc/, scripts/ etc).

On macOS, move the whole Devel package contents into the app bundle,
because that is installed toplevel in the Qt installers, and we
shouldn't even create include/, lib/ or any other directory at the
toplevel at all.

Since the prefix path must now point to the Resources folder inside the
app bundle, adapt build_plugin.py to also accept --qtc-path pointing to
the app bundle (Qt Creator.app) itself, and also to the app bundles
parent directory. Adapt the Qt Creator plugin project template
similarly.

Task-number: QTCREATORBUG-25414
Fixes: QTCREATORBUG-25415
Change-Id: Ic756237fb920b54b1ec95d076649ad947b39a7e8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-06 10:59:27 +00:00
Eike Ziller
b213c87cf4 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

Change-Id: I722a94f37bdd1d78625cfae503ba6d02ff083c63
2021-03-25 11:06:59 +01:00
David Schulz
35b190834c Debugger: fix stringdata offset in metadata
Change-Id: I94899346c8193218133f80aa2716a6e5d44093e2
Reviewed-by: hjk <hjk@qt.io>
2021-03-24 09:55:52 +00:00
David Schulz
e05fe66f4b Debugger: Fix qobject name dumping for Qt 6
Change-Id: I146aa3d0b9d0f66a56a5fb1595f64297e15ebab8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-03-24 08:29:30 +00:00
Friedemann Kleint
cc92c5001b Brush up the Python wizard code templates
Fix the spacing and introduce pathlib.

Change-Id: I240291d91cae7c233b2d3ec5c0dfaeede09ad47d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2021-03-23 11:58:56 +00:00
David Schulz
2177eeb7cd Debugger: Fix QJSValue dumper for qt6
Change-Id: Id0a6796d3a4efca71a7f7474b2143281dc3322f0
Reviewed-by: hjk <hjk@qt.io>
2021-03-23 08:56:59 +00:00
David Schulz
4100b98d70 Debugger: Fix dumper tests for QVariant
Change-Id: I39953e14d3f1a15802b6acfc80a23005e304ee43
Reviewed-by: hjk <hjk@qt.io>
2021-03-23 08:56:46 +00:00
Mahmoud Badri
a52c2519e3 QmlDesigner: Fix import version when adding unimported module
Fixes: QDS-3994
Change-Id: If39df641cbfb563a169b3b2e8001f68941fd398c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-23 08:15:51 +00:00