Commit Graph

6921 Commits

Author SHA1 Message Date
Eike Ziller
9bf0efcbb9 Merge commit 'origin/7.0'
Change-Id: I90148816d32c81b9fef982b5010c785161d83097
2022-05-10 11:45:37 +02:00
Christian Stenger
d10f3f8342 Dumper: Fix map dumper for lldb
Change-Id: I8adab131632b2ca04a3de8094699ab43d2de03bb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-05-10 06:19:25 +00:00
Eike Ziller
70b9f13792 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/libs/utils/qtcprocess.cpp
	src/plugins/cppeditor/cppcodemodelsettingspage.cpp

Change-Id: I602f4ff13f9370ec20704efaea34b42445a75fd4
2022-05-09 09:48:28 +02:00
Christian Stenger
1346ffc159 Dumper: Fix offsets for QFile members
Change-Id: I890b3f387505cf5acc8783e3dc7088515d6934cc
Reviewed-by: hjk <hjk@qt.io>
2022-05-05 07:42:09 +00:00
hjk
61c6f532b2 Debugger: Use Qt 6,2 as fallback version
Change-Id: I0787d212f2a98b3aa2c2f1eda28b93731c81de08
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-04 06:12:38 +00:00
Eike Ziller
3211d064e0 Merge remote-tracking branch 'origin/7.0'
Change-Id: I3da1b663a570682201afbe644d6f9299019aae21
2022-04-26 15:22:35 +02:00
Thomas Hartmann
099f02b5db QmlDesigner: Add new way to load fonts to template
StudioApplication will load the correct font in time.
This only works for Qt 6.

Task-number: QDS-3286
Change-Id: I2d97ca19bace8e13c7a4df355d1addb7267e117c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-04-26 12:09:34 +00:00
Aleksei German
da16d778d5 QmlDesigner: Fix for builds in default MCU project
Task-number: QDS-6599
Change-Id: I77d7f6f8a0df8a9992956d5d23d2e219c1e4f077
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-04-25 10:54:04 +00:00
Eike Ziller
3b2134711b Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/webassembly/webassemblyrunconfiguration.cpp
	src/tools/processlauncher/launchersockethandler.cpp

Change-Id: Iab052af98013aa59282c16f22ae6e9ecb32f50c4
2022-04-20 16:12:41 +02:00
Marco Bubke
4bd71ebf6a QmlDesigner: Fix poor snapshot quality
It removes the image cache in the AssetsLibraryView too because it is not
used. Fix ODR violation too.

Fixes: QDS-6553
Change-Id: I83d8f8b7cd385e2c8352986e4b5a5abd76ac7d5b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-04-13 14:16:20 +00:00
Thomas Hartmann
d3e4fa056a QmlDesigner: Use midmap in states editor
Change-Id: Ia1dc15d911e493e7214d767f3eab15341e0b4e80
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-04-13 11:30:32 +00:00
Miikka Heikkinen
be284f24c0 QmlDesigner: Add configuration for qsb shader generator tool
Added default ShaderTool configuration block to new project template
and use information specified there to generate qsb shaders.

The args property specifies command line argument for qsb tool.
The files property specifies files for which qsb tool is run for.

E.g.:

ShaderTool {
    args: "-s --glsl \"100 es,120,150\" --hlsl 50 --msl 12"
    files: [ "content/shaders/*" ]
}

Fixes: QDS-6590
Change-Id: I3bab0db21d20f486f9f25c1437a27ddb7fb47396
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2022-04-08 07:58:20 +00:00
Eike Ziller
ca480ec601 Merge remote-tracking branch 'origin/7.0'
Change-Id: I9a7a9a5579f1f4e277e7927eefb1bab9ca60ad4a
2022-04-07 09:51:40 +02:00
Eike Ziller
be1437c797 Fix opening terminal with macOS 12.3
macOS removed support for Python2, so switch to Python3 (and fix that we
now need to specify text mode for a temporary file if we want to write
text there, not binary data).

Fixes: QTCREATORBUG-27337
Change-Id: I4884480c32e017aa710f90ab0b5afe493a2adb9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-04-06 13:19:35 +00:00
Christian Kandeler
b404852cb1 qbs build: Do not build the translations by default
Fixes: QTCREATORBUG-27324
Change-Id: Iba2e6b3b211ba7cb6de5e18e67f36d1f4165e23f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-04-05 12:59:11 +00:00
Eike Ziller
780f5da7c4 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/studiowelcome/recentpresets.h
	src/plugins/studiowelcome/userpresets.h

Change-Id: Ie573b945eb28347a36ee1b3582fbd6ab0c0f866c
2022-03-28 15:10:11 +02:00
Samuel Ghinet
90ad0c9500 New Project dialog fix: wrong preset is deleted
The preset to be removed was not selected upon clicking on the "x"
(i.e. delete) button.

Task-number: QDS-6555
Change-Id: I3e7dac0ae78e67fc6236d6b4a9814fae59e40bad
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-28 10:18:49 +00:00
Aleksei German
ff8d672fa2 QmlDesigner: Update MCUs metadata for MCUs 2.1
Task-number: QDS-6535
Change-Id: Ibe9914ddfc48823c8fc4c2b3bc48a06cf6e936bc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-25 10:33:30 +00:00
Artem Sokolovskii
9f63aeb781 Wizard: Remove warning
Fix misspelling

Fixes: QTCREATORBUG-27220
Change-Id: I279ec8982a23aecae099e0062c77e7f1128beb71
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-25 09:54:04 +00:00
Assam Boudjelthia
5f16074cb3 Android: rephrase sdk download popup question
Remove the double column, put the path in new line to avoid potential
word wrap at the start, and surround it with quotes.

Change-Id: Ifb33e4efaaa13342bfc3a75fc58d67e359e4e804
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-25 09:23:52 +00:00
Thomas Hartmann
aabff7bd35 QmlDesigner: Fix puppet crash with DelegateModel
Change-Id: Ibe42b87b6364c78157c54504f00354bff8bb4b23
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-03-24 17:10:55 +00:00
Miikka Heikkinen
4b96545a23 QmlDesigner: Fix add new state plus button centering on all sizes
Take the font size into account when centering the plus sign so it
centers well at all button heights.

Fixes: QDS-6529
Change-Id: Ie221fd2adb0fa19ad6fee1120ea33e702240960c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-24 09:27:15 +00:00
Miikka Heikkinen
9a9cd6d62f QmlDesigner: Prevent showing preview tooltip when button is pressed
On some platforms, drag will stop deliving mouse events to MouseArea.
Disallowed showing the tooltip when a mouse button is pressed.

Fixes: QDS-6481
Change-Id: I8777d57be1bfef8470571027d9257d3a10eb5a7a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-24 05:59:34 +00:00
Eike Ziller
ae6c974fb2 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/android/androiddevice.h
	src/plugins/android/androidplugin.cpp
	src/plugins/android/androidplugin.h

Change-Id: I1a68354415283fe4a7450706520a576d2a1775e0
2022-03-23 14:16:07 +01:00
Artem Sokolovskii
09264b6da3 Wizard: Fix misspelling
Change-Id: Iabf0655fd9d8690e7d18d0cc2366bcbf43835916
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-23 11:41:32 +00:00
Thomas Hartmann
e33150d7b2 QmlDesigner: Fix DirectoryFontLoader
It was not using the new folder structure.

Change-Id: I9ab87ac32dfce203defe7c914f3091121bb6f549
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 17:03:54 +00:00
Henning Gruendl
f14c9d88e1 QmlDesigner: Add placeholder functionality
Add placeholder functionality to StudioControls TextField

Change-Id: I2a6659a40effbc04c42d80a218c0bd70e0b3343f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 16:42:03 +00:00
Henning Gruendl
0c7ec14c62 QmlDesigner: Fix WindowSpecifics for Qt6
* Duplicate WindowSpecifics.qml and move it to QtQuick referencing the
  original from QtQuick/Window as the import changed in Qt6
* Add missing properties to the original specifics: position,
  minimumWidth, minimumHeight, maximumWidth, maximumHeight,
  contentOrientation, flags, modality, visibility

Change-Id: I542f94b153172d4c7b5a2c62ad0abdc53b8bd1fd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 16:40:44 +00:00
Samuel Ghinet
635d6bab0f QDS New Project dialog: Rename NewProjectView.qml to PresetView.qml
Change-Id: I5f129a53404bfb80e3e11f9d73754674f3693952
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-22 13:41:49 +00:00
Samuel Ghinet
9c5f390aa8 Qds Project Wizard fix: cannot select style
This bug was caused by QDS-5741: Use hover states for interactive items

Task-number: QDS-6470
Change-Id: Ice12374257645e39a6c488c30ab584636ba52e9a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-22 12:06:12 +00:00
Artem Sokolovskii
b06db48869 Wizard: Improve QtQuick2 extension plugin
- Added options for Kit version
- Added CMake support for Qt6.2
- Added options for creating example project,
which uses the plugin

Task-number: QTCREATORBUG-26982
Change-Id: I808c01bce6e4015a679f2fd69767c13179a25ee5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-21 12:47:11 +00:00
Henning Gruendl
f347623804 QmlDesigner: Add missing StudioControl in qmldir
Change-Id: I5bbe66b306b0a947256533050a98fc0e4671774f
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-21 10:14:43 +00:00
Eike Ziller
b6f679d777 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/webassembly/webassemblytoolchain.cpp

Change-Id: Ia75c783e3ecab1f97de2b5c73a0979c49da82009
2022-03-18 16:07:51 +01:00
Miikka Heikkinen
10f2fb7be2 QmlDesigner: Don't scan for fonts if resource path is not valid
For some reason captureiconmode puppet is launched at QDS shutdown,
with empty resource path. This caused the entire drive to be searched
for fonts to register, making the puppet linger for up to a minute
after the shutdown.

Fixes: QDS-6482
Change-Id: I0f1fa4b6f5646c76d93f5820dae029033e1543a3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-18 11:27:35 +00:00
Miikka Heikkinen
ce8c578b20 QmlDesigner: Center the add new state button plus sign
Fixes: QDS-6399
Change-Id: I8ed23363fbe8bc09fe8e6825dce096fcc664f6bb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-18 09:59:34 +00:00
Miikka Heikkinen
de8a67a412 QmlDesigner: Add drag support to empty asset library placeholder item
Fixes: QDS-6430
Change-Id: I561f4ed51ccb1e47472adb9baa6e5594eb93eafb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-18 08:24:04 +00:00
Miikka Heikkinen
c865481068 QmlDesigner: Add particle attractor visualization to 3D editor
Particle attractors are visualized similarly to particle emitters,
except that they are shown as blue instead of yellow when parent system
is active.

Fixes: QDS-6426
Change-Id: I085727dac7f3b4fa968e313b78db3f476941a7da
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-18 08:17:37 +00:00
Miikka Heikkinen
d6718fa838 QmlDesigner: Remove unnecessary import dialog for complex assets
Also remove target folder highlights for dragged complex assets.

Fixes: QDS-6433
Change-Id: I499da9444e9f153672fb38b66a6841fb6035cbbd
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 08:16:24 +00:00
Eike Ziller
e914f42458 Merge remote-tracking branch 'origin/7.0'
Change-Id: I9c4ef46084fd392663c7c21c4ecdbc578ea28577
2022-03-18 08:42:02 +01:00
Assam Boudjelthia
5454dda249 Android: keep up with sdk tools changing folder structure
The cmdline-tools package used to have the folder structure "tools/bin".
However, latest packages are using the structure "cmdline-tools/bin".
And since subsequent updates we are installing "cmdline-tools;latest"
package, it will be put in "cmdline-tools/latest" folder, so we cannot
extract to that path, or otherwise sdkmanager will complain that the
path is in use.

Currently we extract it and put it under the SDK path, then use it to
install the essential packages, then it won't be used at all. This patch
changes that by extracting the downloaded package into a temporary
location, and use sdkmanager from there directly.

Also, this patch updates the links to the cmdline-tools along the way.

Fixes: QTCREATORBUG-27174
Change-Id: I1f5d0e38f5a026631e8a3852821d85a69d543c32
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-17 20:45:07 +00:00
Thomas Hartmann
e3babb235b QmlDesigner: Bump version number in wizard template
Change-Id: I2e9dc5863a4f8eacb5f9b258ea0744ad051242f9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-17 15:40:45 +00:00
David Faure
25d70414ab Improve item model templates
* Add missing "return true" in insert/remove Rows/Columns
* Use C++11 syntax for a vector of ints containing just "role"
* Make items not only editable, but also enabled+selectable, as expected
  by default

Change-Id: I8ed529d2534a495f2c924906fe51ada474f9347e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-16 21:33:04 +00:00
Thomas Hartmann
12923a433f QmlDesigner: Add App postfix to project name in cmakelists.txt
Change-Id: Idae3a257ce8b93b7f172fe4a64d548cde54ab7ef
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-16 13:54:55 +00:00
Thomas Hartmann
bed1d5dbf5 QmlDesigner: Fix cmake template for Android
Task-number: QDS-6420
Change-Id: Iac4286b20d763debef082b48e266da121c43ff4b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-16 13:41:16 +00:00
Robert Löhning
59a721c0ea QmlDesigner: Compile fix for Qt 5.15
error: passing ‘const QQmlContext’ as ‘this’ argument discards qualifiers

Change-Id: I4fa9ed0098f5bd63925534459d1171d7c9430897
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-15 12:36:52 +00:00
Samuel Ghinet
ec55793a22 New Project Dialog: Use hover states for interactive items
Also, changed the "Save Preset" dialog so that, when the user presses
Enter, the dialog will be accept-ed.

Task-number: QDS-5741
Change-Id: I7056d1184a3d9d400ac718c8d434cf2ad36ed35e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-15 12:06:07 +00:00
Miikka Heikkinen
72e4287ac3 QmlDesigner: Fix navigator preview of Models
Now we resolve absolute source url for our preview model, so it
will always find the custom mesh files.

Also always use the Node type preview if the instance is a component,
even if the root node is Model. This ensures the preview works properly
in case there are child nodes inside the component.

Fixes: QDS-6204
Change-Id: I48ef273e5a5dca13abe25816b5edf0be7dd217ff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-15 10:45:24 +00:00
Tim Jenssen
6973ee14c4 qds: use double click to create a new project
Change-Id: I77c1d8ed483d5971135469231657d5580617242d
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-11 14:29:46 +00:00
Miikka Heikkinen
8b27281354 QmlDesigner: Show error message on import log for failed 3D import
The import is done on puppet side, so we use a log file to pass the
error message.

Also changed how import process is matched to the import, so that
exit code is no longer needed for this purpose. Crashes are also
now reported as import errors.

Task-number: QDS-6402
Change-Id: Ie14cd1df0bbba965d8e5f2aa7302a955e944379b
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-11 14:18:04 +00:00
Miikka Heikkinen
eeddae0d2b QmlDesigner: Fix runtime JS warning
Particle emitter gizmos do not have locked property.

Change-Id: I4f11dbd52256b365402e647024d4d258351a3c60
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-10 13:44:58 +00:00