Commit Graph

7806 Commits

Author SHA1 Message Date
Eike Ziller
09efabaf89 Merge remote-tracking branch 'origin/7.0' into 8.0
Change-Id: I3780a56c1e02c2e98028aaf02b54733c6f222498
2022-05-30 14:14:04 +02:00
Mahmoud Badri
0b51afe21d QmlDesigner: Implement "duplicate material" feature
Fixes: QDS-7013
Change-Id: I28a11dbd9d6586631c0edcf8003e551917eaac98
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-27 11:20:48 +00:00
Thomas Hartmann
e2f20ddcd5 QmlDesigner.Wizards: Extend version combobox
This patch allows to distinguish between 6.2 and 6.3.

Change-Id: I9ba4c9984673e9e9e6f7d50a1ea35704f7e00211
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-27 09:14:18 +00:00
Miikka Heikkinen
d92bdcce40 QmlDesigner: Show form editor preview for 3D material root nodes
Fixes: QDS-6561
Change-Id: I62a06eb6c83b0a4813a1b20f91b09e17b04a1332
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-27 08:49:14 +00:00
Ihor Ivlev
6f7e7980d2 Display parent functions in the Find Usages menu
To display the parent function, first we find it in displayResults and
store the information to SearchResultItem, then
SearchResultTreeItemDelegate gets the information and renders it.

Similar approach is applied to ClangdClient, in addSearchResultsForFile.

This change also adds default style for containing function highlight in
the search.
Default foreground and background colors are same as usual text colors.

Task-number: QTCREATORBUG-27550
Change-Id: Id1251afa192f8d1232524742b7c211770bcb83fb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-25 15:05:25 +00:00
The Qt Project
6310b84594 Merge "Merge remote-tracking branch 'origin/7.0'" 2022-05-25 09:42:43 +00:00
Eike Ziller
82ee8baad8 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I254066f8be63cb5b15650ef2a470206db56de026
2022-05-25 11:42:13 +02:00
Tapani Mattila
f55fc5276b QmlProjectManager: Add theming support to QDS landing page
Task-number: QDS-6897
Change-Id: I2e1cea556d906d59664cb72612ea1d67ef495f4f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-25 09:18:09 +00:00
Marcus Tillmanns
f117c2a37b ImageContainer: Fix potential use after free
Found during clang-analyzer run.

Change-Id: I6549403ac949650058348ccc22b2020d09ef53e0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-24 14:44:41 +00:00
Eike Ziller
2577ce8ba1 CMake: Add 'Profile' configuration
Get rid of the hardcoded QML Debugging for Debug & RelWithDebInfo from
the project template, because RelWithDebInfo is actually a good
configuration for doing releases (we use it for Qt Creator), and
enabling QML debugging for releases is a bad idea.

Instead enable QML Debugging in Qt Creator for the Debug configuration,
and add a 'Profile' configuration that is 'RelWithDebInfo + QML
Debugging'.

When importing a build, we only set the "QML debugging" option of the
build configuration, if it is enabled in the imported build, even if it
uses CMAKE_BUILD_TYPE=Debug .

One drawback: When not importing a build, but just setting the build
directory of a "Profile" or "Debug" configuration to an existing build,
Qt Creator asks if it should apply "-DCMAKE_CXX_FLAGS=-DQT_QML_DEBUG".
The user can choose not to, but then is asked the next time again, and
it is not obvious that the "QML debugging" option is responsible for
this.

That is somewhat orthogonal to this change though: Even without this
change, if the user changes the QML debugging option from "Leave at
Default" to "Enable", the same happens, and it is also not clear to the
user how to get rid of it. The user might not even have realized that
they changed the option (e.g. on platforms where the mouse wheel cycles
combo box values).

I think the correct solution is to 1. make clearer where the CMake flags
came from in that dialog, 2. allow the user to cancel a build from that
dialog, 3. allow the user to discard these changes (by changing the
setting) from that dialog. But that is for another patch.

Amends 3300182d40
Amends 77fed0b0fd

Change-Id: I95de59473b67c5afd6a53ea7f49838dbaef770d4
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-05-24 13:34:29 +00:00
Mahmoud Badri
4c1e4ed907 QmlDesigner: Unify empty text between material editor and browser
Make the text indicating that there are no materials, same size and
content between the material editor and browser.

Change-Id: I6e9e46c30d89aed090b504b256b113e2601b4659
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-05-24 13:03:24 +00:00
Mahmoud Badri
71e553f497 QmlDesigner: Disable apply material to selected when no selection exist
When there is no valid model selected, disable the "apply to selected"
actions in the material editor and browser.

Change-Id: Id8e771c64e69c0ba2f42dff01d19ffbf4afafb77
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-24 13:01:20 +00:00
Mahmoud Badri
cb93846367 QmlDesigner: Clear components view search box upon load
i.e. upon changing from edit mode to QDS mode. This also removed a
warning.

Change-Id: Ibd3ee3bd30febfcee9a05cb87047e79b8ed1bf61
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-05-24 09:38:59 +00:00
Mahmoud Badri
d66b65b74b QmlDesigner: Maintain asset thumbnail's aspect ratio
Change-Id: I22aa85afbe7bd56df8cf80f792b6bfb93ec01541
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-05-24 08:55:34 +00:00
Christian Stenger
37445824e3 QmlDesigner: Fix puppet build for Qt5
Amends f09d4538e7.

Change-Id: Ibff8b834e65fd18f6345431c8729b7592eab0c5c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-24 07:46:07 +00:00
Mahmoud Badri
f09d4538e7 QmlDesigner: Implement Material Editor
Task-number: QDS-6438
Task-number: QDS-6439
Change-Id: I04e899a68aea665f0df8b65e21523632174ec76b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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-05-23 16:44:02 +00:00
Eike Ziller
f14b1a484a Merge remote-tracking branch 'origin/7.0'
Change-Id: I7037b2b400617b0be0e1a010dd293e4f96d77328
2022-05-23 12:26:27 +02:00
Henning Gruendl
ac1e86fe74 QmlDesigner: Fix missing reference to backendValue
While this fixes an error with a backendValue not being referenced
correctly, it also adds more strict referencing to the getBackendValue
function calls.

Change-Id: Ib1609c71e30fda6c6418d4542cf443b05d0bd6e8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-20 15:57:35 +00:00
Thomas Hartmann
7b95988765 QmlDesigner: Bump version in wizard
Change-Id: I7919a3191775dfabedc9178cdbeb169c46bb1a53
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-20 15:50:52 +00:00
Henning Gruendl
5294c3a23b QmlDesigner: Fix FilterComboBox same value submit
* Fix issue when same URL gets submitted twice in a row
* Fix selection of model item when submitting a custom URL that aligns
  with an item in the model

Change-Id: Ica8819f72a1f2dc0c239eb2ced25a11a1355d81f
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-05-20 08:32:28 +00:00
hjk
296edb321a Debugger: Add dumper for QAnyStringView
Change-Id: Ic7cd577559ae7e73a74daa93784b6f2e1c8abccd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-19 09:15:58 +00:00
Miikka Heikkinen
6dda55a8cd QmlDesigner: Show id-less scenes properly in 3D edit view
Fixes: QDS-6942
Change-Id: I5b7fa966bf9d7321b1735ef0ea7cb904b82f542d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-18 13:30:49 +00:00
Eike Ziller
6a296ab68a Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

Change-Id: I14030f58303839e706af892dd12a67566e3bed68
2022-05-18 13:35:47 +02:00
Henning Gruendl
259759b5c9 QmlDesigner: Fix typo
Change-Id: If6860fe3094124dcac381f72ae88722759167354
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-18 07:37:50 +00:00
Henning Gruendl
414fb08bc6 QmlDesigner: Input lose focus after pressing enter
* Add losing focus after pressing Return/Enter for all TextInputs
* Add losing focus and reverting values after pressing Escape for all
  TextInputs
* FontComboBox fix initial value selection
* Code cleanup

Task-number: QDS-5972
Task-number: QDS-6028
Change-Id: Ice7449e89088f6e7da76eb7c2edefab647b109de
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-17 14:10:01 +00:00
Henning Gruendl
87a7d94629 QmlDesigner: Disable style name ComboBox if empty
Change-Id: I7c2a997f97cc1c45b6700885f3dd5a8e7f6c4155
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-17 14:09:33 +00:00
Eike Ziller
486ec4239a CMake build: List debugger resources explicitly
Developing these files can lead to .swp files from other editors,
and .pyc files when running python files. When these are later removed,
CMake complains about removed dependencies.
List the files to copy & install explicitly to workaround this.

Change-Id: Ie971abad8e9be0d2d7de94caf8836664396885b0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-05-16 13:23:04 +00:00
Tapani Mattila
5019513efc QmlDesigner: Implement first iteration of QDS landing page
Task-number: QDS-6564
Change-Id: I7f92024f9ec521ff9ebe2637146b56c9b30edd59
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-05-16 08:21:48 +00:00
Miikka Heikkinen
17982e661c QmlDesigner: Disable shadows for gizmos
Some gizmos (selection box and helper grid) are drawn to main 3D editor
scene. Disabled receiving and casting shadows for those gizmos so
they do not interfere with scene lighting.

Change-Id: Ia589d3896c2591061966f6a4d532a0dedbf6fe12
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-13 11:11:54 +00:00
Christian Stenger
9be10225cc Dumper: Fix Environment dumper
Change-Id: I48349ca550981d19cf0087bccd38e4d2677d1897
Reviewed-by: hjk <hjk@qt.io>
2022-05-13 08:53:55 +00:00
Miikka Heikkinen
0334d4886b QmlDesigner: Fix puppet crash when property animation has no target
Fixes: QDS-6935
Change-Id: Ib6dae3a6c39a12e9e62bd494d5a27917d7f97048
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-13 07:32:50 +00:00
Henning Gruendl
e703ee97d6 QmlDesigner: Add FilterComboBox
* Add FilterComboBox and SortFilterModel
* Use FilterComboBox in UrlChooser
* Add group attribute to UrlChooser model in order to sort according to
  groups (default items) and alphabetically
* Add escape to cancel modification after editing text
* Fix accepted and activated signal endpoints

Task-number: QDS-6397
Change-Id: I8fd1371d01d86fbbf5fc74ca9f20677d4ea49587
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-13 07:09:42 +00:00
Henning Gruendl
d027c5855b QmlDesigner: Align UX of ComboBox with FilterCB
* Change trigger signal for CheckIndicator
* Change edit state color for ComboBox

Change-Id: I7fa16ccc5cf33161ae3287cd64f481a675403670
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-05-13 07:09:33 +00:00
Thomas Hartmann
bf3c3b624a QmlDesigner: Fix 3D formeditor preview
I remember testing this and ContentUpdateMask seemed to work.
This might have changed with Qt 6.3 and using AllMask instead, which
works for all cases I tested should not have any negative impact.

Task-number: QDS-6896
Change-Id: I648c10fe75df813ae25a54a13a862cad0228bfdb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-05-12 09:11:29 +00:00
Henning Gruendl
42857ce43f QtDesignStudio: Fix assets library external drop
Fix external drops onto assets library for ubuntu. The file paths were
missing the leading slash ("/") which caused external drops to fail.

Change-Id: I4c554df2ac4422d935ec06b835ce34de25b9e2e8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-10 10:39:10 +00:00
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