Commit Graph

7857 Commits

Author SHA1 Message Date
Miikka Heikkinen
557489c3fc QmlDesigner: Fix camera frustum initialization for Qt5 builds
In Qt5 builds, we need additional async update at camera geometry
initialization to ensure source camera is up to date and frustum mesh
can be constructed.

Fixes: QDS-6071
Change-Id: I41371ae66fde432b0fdf4b5fee6a0604d005bf63
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-28 09:00:57 +00:00
Miikka Heikkinen
161d25571b QmlDesigner: Change camera id in 3D app template
Id "camera" conflicts with property name on View3D.

Task-number: QDS-6081
Change-Id: If6a06a9aff75620fc657a8285ac6b2b2a1e8ebc0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-28 08:59:15 +00:00
Miikka Heikkinen
94a17f1e7e QmlDesigner: Fix 3D picking of RuntimeLoader loaded models
RuntimeLoader creates the loaded nodes dynamically, similar to
Repeater3D and Loader3D, so handle it similarly as well.

Fixes: QDS-6053
Change-Id: Iece15254e720cfc0a6796b182ef00c3a773cf35d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-28 08:58:49 +00:00
Aleksei German
35d32c9784 QmlDesigner: Update for QUL metadata
Task-Numbers: QDS-5867, QDS-5890
Change-Id: If27d947d88e34f8479796520dad2bee62a6d0ec9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-27 16:26:01 +00:00
Eike Ziller
79fd6510a3 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I8b1cdfb72b0e3e583c94447f13d0161b99fa93c1
2022-01-27 09:37:39 +01:00
Eike Ziller
f9de2f2b23 Qt Creator plugin wizard: Bump checkout github action to v2
v1 has security concerns

Change-Id: Ia88cf55197a64af819abe07bdac698a29bec8aeb
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-27 08:06:28 +00:00
Christian Stenger
c492b29a45 Nanotrace: Make nanotrace commonly usable
CMake's auto symbol export is a plain hack and does not work for
other build systems.
Besides fixing some non-working implicit conversions when using Qt5.15.

Change-Id: I80b77a4ebf8cad30c78c1c2ef2034e62d2063399
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-27 05:38:48 +00:00
Eike Ziller
be5fb98f1f Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I72684fe4b0857e52a15ee83721f9d7975582a8d2
2022-01-26 09:25:13 +01:00
Alessandro Portale
43a9423a9b Wizards: Make wizard icons a bit lighter
Changing the Wizard icons into themed ones turned them quite dark (in
non-dark themes). This change mitigates the issue by making the dark
lines thinner and shaded areas smaller and brighter (vice-versa for dark
themes).

Amends: 05e89384e2

Fixes: QTCREATORBUG-26565
Change-Id: Ie1d251d6443576c4e5db26a2b1485b4f4ab63f82
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-25 17:44:21 +00:00
Henning Gruendl
250738d858 QmlDesigner: Fix icon font
Change-Id: I31a656e711d1bff24eedfc80ee5c62c594c03c19
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-25 15:41:28 +00:00
Knud Dollereder
ebac821e9e Replace minitrace with nanotrace
Minitrace is a library to produce json traces suitable for chromes
built-in trace viewer. Unfortunately it lacks the ability to add
custom arguments to the json files which is needed in our case
in order to examine Design Studios state from within the evaluating
python script. Nanotrace is a rewrite of minitrace that adds this
ability. Additional benefits are higher precision and the fact that
it is written in c++.

Change-Id: Id2610b93188483d88547369c3fa8dacbe4dee9f7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-25 14:25:04 +00:00
Jere Tuliniemi
a03a50a262 QmlDesigner: Add camera alignment buttons
Add a button to 3D edit view that aligns the selected cameras to the
view camera. Add another button that aligns the view camera to a
selected camera.

Task-number: QDS-4482
Change-Id: Ibe6ceaf498db10f45c8c351e3a108419d8d7a59b
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-25 14:15:54 +00:00
Henning Gruendl
e05ecea4f5 QmlDesigner: Fix colors in some control states
* Fix color of press state in AbstractButton and CheckIndicator
* Replace hard coded color value for disabled due to MCU

Change-Id: Ic73c95e263ad30a5804f77ef1bfa44fa16ed5de9
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-24 16:37:03 +00:00
Henning Gruendl
94bf7a656f QmlDesigner: Fix SpinBoxIndicator hover/edit state
* Make global hover work on disabled SpinBoxIndicator
* Fix disabled state not showing in edit mode
* Hide/blend indicator on drag operation
* Some color changes

Task-number: QDS-5970
Task-number: QDS-5975
Change-Id: I4965b4c6ad906fe05f8a43cabb1914e15a23ba7d
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-24 16:36:27 +00:00
Henning Gruendl
7c38ee31e3 QmlDesigner: Update SpinBoxIndicator icon in font
Change-Id: Ib2921239fc5e29b5a0b14bb90eda56117fba12cf
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-24 16:36:16 +00:00
Henning Gruendl
c7c7747906 QmlDesigner: Adapt theme colors to welcome screen
Change-Id: I566a692c05f9799e4f44718a426d9536d5e2b9cd
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-24 16:36:05 +00:00
Eike Ziller
9d8a419d10 Remove qmake build files
Removes qmake as a build system for building Qt Creator itself.
Keep them for some tests that are not completely moved to CMake yet.

Change-Id: I846c6ef65626b6dfae6375fdc85d00677aa8c2fb
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-20 12:18:15 +00:00
Cristian Adam
e9f3f8cc64 CMake: Use newer FindPython3 module for CMake version greater than 3.12
FindPythonInterp and FindPythonLibs are deprecated since CMake 3.12.

Fixes: QTCREATORBUG-26727
Change-Id: I53400d49ef6888bbeabb063a873c494b11d27e15
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-19 18:25:18 +00:00
Jean-Michaël Celerier
e0f539a068 Debugging helpers: support for boost::small_vector
Change-Id: Ided74fa2ebf3e4ae5258e22064bb105bd45710ac
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Ihor Dutchak <ihor.youw@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-19 11:34:33 +00:00
Eike Ziller
8db86aba4c Merge remote-tracking branch 'origin/6.0'
Change-Id: I92049adb2b200e9106513eb2275019890bd13b6c
2022-01-19 11:42:32 +01:00
Miikka Heikkinen
ee4ed51a57 QmlDesigner: Fix qml warning
Change-Id: I230de5dffb47bc6e251507edf66843f24d05fa19
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-01-18 13:11:56 +00:00
Mahmoud Badri
54e7d41726 QmlDesigner/StateEditor: Remove default state's yellow highlight
Task-number: QDS-5973
Change-Id: Ie4b82bfbbb91a48152a969bb988220303854709d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-18 10:15:00 +00:00
Eike Ziller
6914deb0da Merge remote-tracking branch 'origin/6.0'
Change-Id: Ie8406c1854738cabcc85ef6ddaee7559d5227bec
2022-01-17 16:52:31 +01:00
Henning Gruendl
b12b656588 QmlDesigner: Fix UrlChooser not showing items
Change-Id: Ie9cb697837e9a6a5be666a598dffdee52f90fd08
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-17 15:12:33 +00:00
Eike Ziller
491e5c4176 Merge remote-tracking branch 'origin/6.0'
Change-Id: Ic1790446cb453e3d8a24467a31e3c8df33bc68bb
2022-01-17 11:22:11 +01:00
Samuel Ghinet
c1c147a9dc QDS-5691 Create a tab for Recent choices
The Recents should store presets, rather than normal project items,
while the rest of tabs are to store normal project (i.e. wizard) items
but with the default screen size written under the wizard name.

In this patch I also did a few renames: e.g. the Presets view now uses a
PresetModel rather than ProjectModel, because we now store presets. A
Preset is a higher level concept than Project / Wizard item: it can be a
project/wizard item with pre-defined configurations; and now we can have
multiple presets using the same Wizard factory. Renamed struct
ProjectCategory to WizardCategory, because the items are grouped by the
category of the wizard (i.e. the "category" property of IWizardFactory)

I extracted a class, PresetData, to hold the data that is being shared
by the PresetModel (items in the view) and the PresetCategoryModel
(header/tab items). It stored both information on normal presets and on
recent presets.

Made changes to JsonWizardFactory so that I could extract the list of
screen sizes without requiring to build a wizard object first. This is
important, because multiple JsonWizard objects cannot be created at the
same time and I need to show the screen sizes of multiple presets /
wizards as the Presets view is opened. This also required class
WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory
-- since "screen sizes" are a particularity of the json wizards, not of
all kinds of wizards.

Also, fixed a TODO in WizardHandler::reset() method.

Also, added a few utilities I had need of, in algorithm.h.

Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-17 08:59:09 +00:00
Alessandro Portale
196aee97b1 Welcome: Unify design with Qt Design Studio
This applies the design of the new Welcome Screen for the Qt Design
Studio to the Welcome Screen of Qt Creator.

Change-Id: Id63283da1db43ac1036d371694cc2ea4a6de8d8c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-14 12:12:21 +00:00
The Qt Project
03e4548d24 Merge "Merge remote-tracking branch 'origin/6.0'" 2022-01-14 11:47:06 +00:00
Miikka Heikkinen
97a6d37ef3 QmlDesigner: Support moving 3D edit camera with arrow keys
3D edit camera can now be moved up/down/left/right with arrow keys.

Task-number: QDS-5790
Change-Id: I3b4a095b96bdaa9d00bf6b29b750af1f783b485e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-01-14 09:40:16 +00:00
Eike Ziller
7a94cca007 Merge remote-tracking branch 'origin/6.0'
Change-Id: Ia208fc746333e3d36868c580aa7794da9627c3e0
2022-01-14 10:24:10 +01:00
hjk
0f3e4531c5 Debugger: Add separate display to QStringView dumper
And don't show the plain members anymore, unless explicitly asked.

Change-Id: I9854276c380d417fb9a98ae9c0dbae9356d42086
Done-with: Thiago Macieira
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-13 14:05:56 +00:00
Christian Stenger
1463c5d09f Wizards: Allow QtQuick tests for Qt6 as well
Change-Id: I476ad3519ed685ada4f1451906b5ba2fdfe8969b
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-01-13 10:06:59 +00:00
Eike Ziller
9056d708fa Merge remote-tracking branch 'origin/6.0'
Change-Id: I642abb110bb120e20af11a5d55244c03e6c48caa
2022-01-12 13:59:10 +01:00
Henning Gruendl
ad1340cbe6 QmlDesigner: Add 0 value to layer samples control
Change-Id: Iafdbc5a8351c05ce4face948ff046781b6551335
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-12 12:31:16 +00:00
Christian Stenger
0614d9ba4d AutoTest: Enhance QtQuick Test wizard
The wizard can now generate setup code as well.

Fixes: QTCREATORBUG-26741
Change-Id: If67ba0556001c5acd9ad6e5d98458771589f2ebd
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-01-12 12:02:46 +00:00
Henning Gruendl
395b9aa9cf QmlDesigner: Add tool tips to disabled anchors
Add tool tips to disabled anchor buttons to make clear what the reason
for disabling is.

Task-number: QDS-5388
Change-Id: I193ba5ced45a6cb4d90e8475fc992029f58337d3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-12 11:52:05 +00:00
Henning Gruendl
c3334f105a QmlDesigner: Add renderTypeQuality property
* Add renderTypeQuality property in TextExtraSection
* Add renderTypeQuality to bannedProperties in all qul files

Task-number: QDS-5935
Change-Id: Ie22252a7b19704015834a0e413362ad84179b1e3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-12 11:51:35 +00:00
Antti Määttä
3c2c8b97a1 Use Repeater3D instead of Object3D in component complete check
Do not use QQuick3DObject when disallowing recursive component complete
check so that the animations get added to the instance server.

Fixes: QDS-5731
Change-Id: Iff8e39f74d68b312b66d68adaf6ab79d625f88f8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 09:03:53 +00:00
Eike Ziller
501b6eff9c Merge remote-tracking branch 'origin/6.0'
Change-Id: Id84183d2ba73dbe98700af43074cc2d05b26f06d
2022-01-10 09:47:11 +01:00
Thomas Hartmann
d987d305ef Theming: Extend theme with color roles for WelcomePage
Change-Id: I1eb8b6231a15cdc427d6d2a08d657bd697379229
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-06 22:08:00 +00:00
Eike Ziller
65e8c864af Merge remote-tracking branch 'origin/6.0'
Change-Id: I405e3f95b0cdcd7b2686f31baae16c03c787f007
2022-01-06 11:55:39 +01:00
Thomas Hartmann
973cb815bd QmlDesigner: Define isLightTheme in values
Adding a few missing color roles.

Change-Id: I229fdc2e1b1f9890a5a8c5e98c57329a7e3a6fff
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-05 19:17:00 +00:00
Thomas Hartmann
1d2636dd08 QmlDesigner: Add support for .ktx
Task-number: QDS-5849
Change-Id: Ibe0bb3f2480a25a2d80793526d6581e89c22529f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-01-05 15:04:17 +00:00
Henning Gruendl
bff1e9cc37 QmlDesigner: Add default items support in ComboBox
* Add defaultItems property to UrlChooser in order to add default items
  to the ComboBox model
* Add StudioControls.ComboBox deselect after editing finished
* Replace the simple model by a ListModel
* Fix UrlChooser tool tip
* Use function with changed handlers for parameter proper access

Task-number: QDS-4966
Change-Id: I109e1787b6be06657b22cedca1cd9210d974a23d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-01-05 14:45:58 +00:00
Samuel Ghinet
0db5aa1e8e QDS New Project dialog: Add scrollbar to Styles list view
The scroll bar becomes visible only on hover -- i.e. when the mouse is
over the list view items.

Also, extracted the ScrollBar item from Details.qml (and now Styles.qml)
into VerticalScrollBar.qml which I put in StudioControls. This is almost
identical to the VerticalScrollBar.qml from HelperWidgets -- the only
difference, the one I created here also supports "show bar only on
hover"

Task-number: QDS-5500
Change-Id: I7692cdbc0892086783a89d0bb397a112eff46630
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-05 10:29:11 +00:00
Eike Ziller
7d92375b2f Merge remote-tracking branch 'origin/6.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangcodemodel/clangdclient.cpp

Change-Id: I75c954d2e573d65089205d2542747bba3276be2a
2022-01-03 14:14:12 +01:00
hjk
ea13ade822 Debugger: Add QStringView dumper
Fixes: QTCREATORBUG-20918
Change-Id: Ib16ac37000d227e6af2bc6d6640136ba0a7333b1
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-03 13:07:56 +00:00
Thomas Hartmann
e35dedcf32 QmlDesigner: Add a plugin for studio wizards
This plugin contains the Qt Design Studio specific wizards.
Beforehand the plugin was part of another private repository.
With this patch, those wizards become open source.

The wizards require a specificly configured Qt kit that
comes with Qt Design Studio.
This is checked by
"featuresRequired": [ "QtStudio" ] in the wizards.

Task-number: QDS-5703
Change-Id: Ic9adcc7ff0cbb3ec6a7dfe51b506b4f86c6f50bc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-12-23 13:57:39 +00:00
hjk
d76fab2685 Debugger: Add dumper for quint{16,32,64}_{be,le}
Change-Id: Ieaa27a98b829455b69de0f8051fee8cbc3fa78f0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-12-21 08:52:30 +00:00
Eike Ziller
7630965c7a Wizards: Fix some properties for Qt GUI applications
Make them GUI applications on Windows and bundles on macOS.
Add some bundle properties for 6.2+ Qt Quick applications.

Change-Id: Icc4650a8c486c6b6cefed7f479185a5babf80b14
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-12-17 13:15:41 +00:00