Commit Graph

7806 Commits

Author SHA1 Message Date
Eike Ziller
211d6507c3 Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
	src/plugins/updateinfo/updateinfoplugin.cpp

Change-Id: Ie1bf2ad434f0224fb91caf91b443daae3d5b5ec0
2023-01-12 09:07:27 +01:00
Eike Ziller
1d2c8c213d German translation: Some individual items
That complete translations of various contexts

Change-Id: I0b2236efdb63f6ec9280ef5406410afd196a986a
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-12 07:57:06 +00:00
Alessandro Portale
f7bcd4f574 CppEditor: Convert to Tr::tr
Change-Id: Ic4025e06e17c45eb6dc2162fb7f21f5b8aebe84d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-12 06:46:45 +00:00
Ali Kianian
b2163f672f QmlDesigner: Add designer icons to the context menu
New Icon-Font is available in this patch.
Designer Icons are visible in the context menu.
Icon settings would be loaded from a json file.

Task-number: QDS-8502
Change-Id: Ia5fb570317507e6f50a79231d5b6831df079ed8b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-12 06:08:31 +00:00
Łukasz Wojniłowicz
76260f8038 Debugger: Port away from deprecated getargspec
https://docs.python.org/3/whatsnew/3.11.html suggests using
getfullargspec instead.

Fixes: QTCREATORBUG-28505
Change-Id: I27199f7e2c3a070c675dce3a152d201e22a16380
Reviewed-by: hjk <hjk@qt.io>
2023-01-11 15:38:46 +00:00
Łukasz Wojniłowicz
0648cd49f9 Debugger: Don't split top-level name into letters
If names = ['foo.bar'] then toExpand = ['foo.bar', 'foo'] instead of
toExpand = ['foo.bar', 'foo', 'fo', 'f']

Change-Id: Ia6e021b1f32d9f1e5a78209e9a269725e298409e
Reviewed-by: hjk <hjk@qt.io>
2023-01-11 15:37:39 +00:00
Henning Gruendl
6fba34f5a7 QmlDesigner: Fix reflection in ColorEditor
Change-Id: I0d4cced42dd2b1d98f46c9870ca206e83b3aa4db
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-11 10:57:16 +00:00
Henning Gruendl
4a897e0395 QmlDesigner: Enable sourceRect property
Enable sourceRect property to Item layer specifics

Change-Id: If2f47c2ad47a083d5c4a30c9154a7631616ea257
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-11 10:15:56 +00:00
Henning Gruendl
9df7a6bdad QmlDesigner: Fix SpinBox dragging
Change-Id: I9d6ef0fa03e7d9a26dea9eb98602238d5dacd28c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-11 10:14:38 +00:00
David Schulz
c4f6fd5dd2 Python: Remove wizard for dynamically loaded ui projects
The dialog and main window variant of this wizard was broken since ever.
Generally two widget ui templates are generally confusing for the user,
so remove the broken wizard that promotes the not recommended way of
using ui files. Also we support the automatic conversion from ui to py
files nowadays via the PySide6 project tool.

Fixes: QTCREATORBUG-25807
Change-Id: I3ec6000a6c3fb076e3a54c70f3cccdd12df28701
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-11 08:42:17 +00:00
Eike Ziller
647287ee0c German translation: Debugger
Change-Id: I37f8f54b498d21e9c84fe5b795a2fe4eb5df6864
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-01-11 07:36:36 +00:00
Samuel Ghinet
ff9c170053 QmlDesigner: Show metadata of assets when being hovered on
This change does not affect font files.
For all other assets, the file type is now also shown in tooltips
For image assets, the image size is also displayed.

Task-number: QDS-8177
Change-Id: Iceb93a0ffe1cb284a87cc93f1da2060f6f4f1529
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-10 19:10:02 +00:00
The Qt Project
b02b60800e Merge "Merge remote-tracking branch 'origin/9.0' into qds/dev" into qds/dev 2023-01-10 17:49:33 +00:00
Tim Jenssen
9eb2a7bc5b Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: Ic60cb293d07e7e25716adfbaa2f35e9d25ca148b
2023-01-10 17:48:42 +00:00
Pranta Dastider
03eb5daf8d QmlDesigner: Update Tooltips for 2D Geometry Section
This patch update tooltip text for 2D Geometry Section fields.

Fixes: QDS-8722
Change-Id: Id2db204057778fd141bbe17204e200d59070db8a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-10 15:13:03 +00:00
Eike Ziller
0dfa542bee Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/plugins/cppeditor/cppcodestylesettingspage.h

Change-Id: I1aa4e2f9efc6d9cf9f284aef1abf148be9b93a60
2023-01-10 15:44:55 +01:00
hjk
0a0dd9ea31 CppCheck: Tr::tr and code cosmetics
Change-Id: I5e6583984f7dc94e998df3c20840f2ba2e801ab8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-10 10:20:03 +00:00
hjk
f5dce50dae Conan: Convert to Tr::tr
Change-Id: Ibeb29c39923db0f1c95e0db41dd7b2a1f8d670db
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-10 10:11:40 +00:00
Kai Köhne
4e9c1d126c Replace GPL-3.0 with GPL-3.0-only
GPL-3.0 is deprecated by SPDX.

Change done by

 find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \;

Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 08:05:04 +00:00
Pranta Dastider
20cbf4d34b QmlDesigner: Update Tooltips for Component Section
This patch update tooltip text for Componemt Section fields.

Fixes: QDS-8724
Change-Id: Id3fed9163c4ad6e61b762a5760cd5f2d7c079183
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-09 13:45:34 +00:00
Artem Sokolovskii
deeda4c9ed Android: Update "Android SDK Command-line Tools" version
From v6.0 to v8.0

Change-Id: I85a2b98bba3192abe2dc8f26043d42d768ea8a67
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-06 18:02:46 +00:00
Dmitry Bravikov
34ff9c97e6 Debugging: Add dumpers for libcpp types: variant, optional, tuple
Task-number: QTCREATORBUG-25865
Change-Id: I262ac708ae040982d2ed4f62e1f95807eaaae718
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-01-06 12:07:45 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
hjk
c7bb5fcc37 Debugger: Remove spurious waring
Task-number: QTCREATORBUG-27160
Change-Id: Ie69c60688249efcd4d2c2330d6555cf7f708edd2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 08:32:09 +00:00
Alessandro Portale
4e0b4fcc92 QtQuick Application wizard: Add "QDS style project" option
This adds a checkbox labeled "Design Studio style project" to the
Wizard. With that selected, the project is generated via the "General /
Empty" templates of QDS with Qt 6.2 as target Qt version, 1920x1080 form
size, the "Material" QtQuick.Controls style ("Light" Theme) and CMake
project format.

At the same time, the preexisting QtQuick Application wizard in Qt
Creator now also focusses on Qt 6.2 and CMake. TS file generation is
removed for now, can be added later, but then using the i18n setup
feature of QQmlApplicationEngine (instead of a QTranslator in main.cpp).

The wizard now focusses on the QML CMake API. In order to filter the
kits accordingly, the flag "QtSupport.Wizards.FeatureQtQmlCMakeApi" was
added.

Task-number: QTCREATORBUG-28436
Change-Id: I80bc5585f31ec82c64f845701c768f8a07e000da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-05 13:09:59 +00:00
Eike Ziller
098c717678 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/plugins/qtsupport/qtoptionspage.cpp

Change-Id: Ic8ada9fd47f5eb62e751b6188a45b95ddb36122d
2023-01-05 09:47:06 +01:00
Henning Gruendl
7f748acc3e QmlDesigner: Fix ColorEditor anchor warning
Fix warning caused by the ColorEditor. Detected anchors on an item that
is managed by a layout. This is undefined behavior; use Layout.alignment
instead.

Change-Id: I58a618054e7e269e770aa53585472474a1b77cdd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-03 12:40:06 +00:00
Eike Ziller
bd679b61d1 German translation: Fix error message when installing plugin
%1 resolves to "Qt Creator" or "Design Studio", and the message means
that no plugin for that application was found in the extracted zip.

Change-Id: I1f07a3557bdac7dcabf26206aa12fabac0ca272d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-01-02 15:15:34 +00:00
Tim Jenssen
f2956ece11 Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
  src/plugins/updateinfo/updateinfoplugin.cpp
  src/tools/qml2puppet/CMakeLists.txt
  src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp

Change-Id: I6b65ce2d603453fcebc2291574d55db80853f247
2022-12-22 14:08:46 +01:00
Samuel Ghinet
f9a0b325d7 QmlDesigner: Fix the right margin for the AssetsView
Task-number: QDS-8352
Change-Id: If08cf7c39cea9dde8e241214c775685b4b1fd4f8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-20 14:02:42 +00:00
Mahmoud Badri
e4af787ff6 QmlDesigner: Add image info to content library texture tooltip
Fixes: QDS-8489
Change-Id: I1afbf91ad12839cc93a46f0a608ab3bda135b76b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-20 11:29:30 +00:00
hjk
f81724f458 Debugger: Make android std dumpers refer to libcpp
Amends af881688e5.

Change-Id: If207dd04e37e5f80f68b374fe66fd3beec330ead
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-12-20 11:19:46 +00:00
Amr Essam
fb12660b0a QmlDesigner: Enable integration of the new create effect system
- Remove old New Effect item from new file dialog
- Add license checker for creating effects

Task-number: QDS-8675
Task-number: QDS-8676
Change-Id: I83ed2c4021c9df3896018da19fbff76be92a7431
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-19 15:06:53 +00:00
Amr Essam
08d4eab619 QmlDesigner: Create menu for Effects creation in the Asset Library
- Add menu item for effect creation instead of new file dialog
- New effect dialog with validating qml file name with qml naming conventions
- Open Effect Maker automatically when an effect is created

Task-number: QDS-8490
Task-number: QDS-8578
Change-Id: I04b075a0b283318906f309c7d394eda48577ae74
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-19 13:57:59 +00:00
Sami Shalayel
90b8e482c9 qml code model: load builtins import
LinkPrivate::linkImports() would either load the <builtins> or the
<defaults> module, but only process the <defaults> module in
LinkPrivate::populateImportedTypes().

Note: The <defaults> module (from the package '<default>') is the
QtCreator magic replacement for the actual <builtins> modules
(from the package 'QML').

This means that if the <defaults> were loaded, then QtObject would
be recognized as an object from QtQuick.
On the other hand, if the <builtins> were found, then neither
<defaults> nor <builtins> would have been imported and QtObject
would not have been found in the imports (because neither <defaults>
nor <builtins> would have been imported).

The "<defaults>-found" situation happens right after a "reset code
model" while the "<builtins>-found" appears when the qml code finally
found the <builtins> package, usually after running cmake or when a
project was freshly opened in Qt Creator.

Instead, always try to load both <defaults> and <builtins> module.

Also, fix the builtins.qmltypes (that contains the qt creators magic
types) to reflect that Component and QtObject
are both available from the QML package (the <builtins> module), as
else one cannot import QtObject from QtQml after a code mode reset.

Fixes: QTCREATORBUG-28287
Fixes: QTCREATORBUG-28375
Change-Id: I67084a169dc5ca8ec2474b721dbef83cd47037c7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-12-19 13:53:59 +00:00
Miikka Heikkinen
c476a1b807 QmlDesigner: Intercept stray mouse events on popup menus
By default Qt Quick Controls Menu lets mouse events through to the
underlying view if the event is not handled by the menu item.
This is the case for all clicks on disabled items and right clicks
on enabled items.

To prevent unwanted click-throughs, added a mouse area to the
background of StudioControls.Menu that eats all clicks.

Fixes: QDS-8584
Change-Id: I08fa93317ffcaf518b350d44bb555d84741e246d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-15 12:20:24 +00:00
Samuel Ghinet
7e5ecfe8bc Fix glitch in AssetsView when dragging files onto it
Moved the DropArea from the AssetDelegate into the AssetsView, so that
moving the cursor through the delegates no longer denies and then
permits dragging. This glitch happened because the DropArea was inside
the delegate, while the TreeView also has rowSpacing, which are areas
that do not belong to the delegates, and for which you don't normally
have drag & drop support.

Task-number: QDS-8232
Change-Id: If49a384f25bb870105448156f436e048479e880c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-15 11:54:34 +00:00
Thomas Hartmann
3066dce3b8 QmlDesigner: Show error message if Qt is less than Qt 6.2 in template
The cmake application template requires Qt 6.2 or higher.
Otherwise we show an error message.

Task-number: QDS-8110
Change-Id: Ib22edae8634727e17edf2bb19594549bd81a49b4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-14 16:11:58 +00:00
The Qt Project
4723848be5 Merge "Merge remote-tracking branch 'origin/qds/dev'" 2022-12-14 15:19:02 +00:00
Tim Jenssen
7f234ed768 Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
  src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp

Change-Id: Ieda6242b845387100022b08251283891fb0fbda7
2022-12-14 14:30:09 +00:00
Sami Shalayel
5935536b71 qml code model: load builtins import
LinkPrivate::linkImports() would either load the <builtins> or the
<defaults> module, but only process the <defaults> module in
LinkPrivate::populateImportedTypes().

Note: The <defaults> module (from the package '<default>') is the
QtCreator magic replacement for the actual <builtins> modules
(from the package 'QML').

This means that if the <defaults> were loaded, then QtObject would
be recognized as an object from QtQuick.
On the other hand, if the <builtins> were found, then neither
<defaults> nor <builtins> would have been imported and QtObject
would not have been found in the imports (because neither <defaults>
nor <builtins> would have been imported).

The "<defaults>-found" situation happens right after a "reset code
model" while the "<builtins>-found" appears when the qml code finally
found the <builtins> package, usually after running cmake or when a
project was freshly opened in Qt Creator.

Instead, always try to load both <defaults> and <builtins> module.

Also, fix the builtins.qmltypes (that contains the qt creators magic
types) to reflect that Component and QtObject
are both available from the QML package (the <builtins> module), as
else one cannot import QtObject from QtQml after a code mode reset.

Fixes: QTCREATORBUG-28287
Fixes: QTCREATORBUG-28375
Change-Id: I67084a169dc5ca8ec2474b721dbef83cd47037c7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-12-14 14:04:34 +00:00
Tim Jenssen
db4bbfdf4b Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I4305c3b37814cc3a926e8e56cabe5f8935f8f2c0
2022-12-14 13:39:31 +00:00
Eike Ziller
a3fe24d192 Merge remote-tracking branch 'origin/9.0'
Change-Id: I5298a6529921568ec32c0fe0c009c273263b0f5d
2022-12-14 14:25:38 +01:00
Eike Ziller
5cb1a29af2 German translation: Some cleanup
Make some things more consistent:

- Systemumgebung löschen -> bereinigen
- Mitglied -> Member
- gegenwärtig -> aktuell (or gerade)
- Alles auf/einklappen -> Alle auf/einklappen
- Tool-Tip -> Tooltip
- some spezifisch -> abhängig

- fix "_Run_ Without Deployment" to be a verb
- make translation for "No updates found" shorter, because it appears in the status bar

Change-Id: Ieb7b56f03883eb5c18d7de79e997b24a17c56001
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-14 08:32:57 +00:00
Marcus Tillmanns
af881688e5 Debugger: Fix name of "mac_stdtypes.py" file
It was incorrectly assumed that the types were only used on macOS.

Change-Id: I8acc326fe63d4cb96b764da1262355d24494f337
Reviewed-by: hjk <hjk@qt.io>
2022-12-14 08:25:37 +00:00
Miikka Heikkinen
857ee29c1a QmlDesigner: Add support for dragging textures to materials
Dragging textures to materials within material browser now works.

Fixes: QDS-8552
Change-Id: I1ec0287020fe2cd347bc0db7cda9d235678e9f04
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-13 15:13:42 +00:00
Cristián Maureira-Fredes
34ecdfc682 Add QtQuick.Window import for 5.15.x projects
Some of the templates were using the Window type
but didn't include the import statement for 5.15

Fixes: QDS-8468
Change-Id: I414d2bd09198374835de1ca6c81c8ed62d08dede
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-13 14:07:13 +00:00
Mahmoud Badri
521f220efb QmlDesigner: Add basic texture's info to tool tip
Fixes: QDS-8488
Change-Id: If4672863babef03bdc108109c514837a2587c6a8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-12-13 09:56:08 +00:00
Miikka Heikkinen
56e242c9f9 QmlDesigner: Disable 'add to selected model' option when it's not valid
MaterialBrowserTexturesModel's hasSingleModelSelection property value
is now updated at context menu open, as that's the only place using it.
This is similar to how hasSceneEnv is handled.

Fixes: QDS-8582
Change-Id: I63871a5557c90a06633eee52840b267d808bfe27
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-12 13:12:23 +00:00
Miikka Heikkinen
df622c9c3c QmlDesigner: Fix expand all and collapse all in content library
Fixes: QDS-8413
Change-Id: I98931c52f63bbbfd7a42e522a762d77b469df5da
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-09 13:27:25 +00:00