Commit Graph

6226 Commits

Author SHA1 Message Date
Jarek Kobus
37ccef9a0f Silence warnings about unused arguments
Silence warnings when QUICK3D_MODULE is not defined.

Change-Id: I4974ce04e2d6185764d91767461e038eac59d90a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-11-13 09:14:01 +00:00
Thomas Hartmann
98c735be6e QmlDesigner: Fix for high dpi and Qt 6
When grabbing the window  we have to clip the window using
the root item size.
Depending on the window manager the window is resized.

Another issue is that when grabbing the window offscreen
the pixel ratio is always 1.

Before we assumed that the pixel ratio of all images
is the same for the host process as for the puppet.
This is not necessarily anymore and we have to set
and forward the correct pixel ratio.

Change-Id: I36b467291ab120f825119adea4ed7db10d34266d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-11-12 15:15:48 +00:00
Thomas Hartmann
3d767fcfe1 QmlDesigner: Hide windows again
Change-Id: I0b22a8bbaabaf2290aa134aebd0044fd81bb5e56
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-11-12 15:09:31 +00:00
Miikka Heikkinen
767db9a92b QmlPuppet: Disable navigator preview image creation in Qt6
This frequently crashes the puppet. Will be re-enabled once the
underlying issue QTBUG-88320 is fixed.

Task-number: QTBUG-88320
Change-Id: Ie4c1ad914e5bd62dcf3b132cea588ba6fc003bc5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-12 13:53:07 +00:00
Eike Ziller
46d2046173 Merge remote-tracking branch 'origin/4.13' into 4.14
Conflicts:
    src/shared/qbs

Change-Id: If75741825f5788165f9bf2f0248e976811273b6a
2020-11-12 11:39:01 +01:00
Eike Ziller
c1e850123a cmake build: Fix permissions of scripts in installation
CMake doesn't copy file permissions by default.

Fixes: QTCREATORBUG-24907
Change-Id: I3f452502de49517f72ace1a4a2696c797c95bdfa
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-11 16:30:49 +00:00
Eike Ziller
1543060ffb Change Qt Creator plugin wizard to CMake
Doesn't make sense to put more qmake-based projects out there
for Qt Creator, so exchange the qmake version completely.

Also adds a README.md, which explains how to build and run a plugin,
since plugins no longer are built directly into a Qt Creator build
(which is a good thing).

Since we do not yet have a way to specify detailed build settings
from a wizard, keep the hack that the project file has a hardcoded
path to the Qt Creator development package. That way developers can
at least directly build the new plugin without fiddling with
build settings.

Fixes: QTCREATORBUG-24073
Change-Id: If6650d9e3c393ee9ac2a358923dfb072ec510850
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-11 15:35:01 +00:00
Marco Bubke
2a2dfbec73 QmlDesigner: Add states to ImageCache
Task-number: QDS-2998
Change-Id: I8e65881181ae1010ef1f8bab92fa71d92c961bcd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-10 14:35:12 +00:00
Eike Ziller
5dff6434e5 Move translations README to markdown and adapt for CMake
Change-Id: I7c66afbd8cf84ec9cfe9bfe22e8cacf47d9f2bf8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-11-10 10:33:50 +00:00
Henning Gruendl
f66e2f508f QmlDesigner: Fix navigator selection issue
* Fix navigator selection issue caused by clicking on icon columns of
  a locked item
* Fix visibility icon in icon font
* Remove redundant selection behavior call

Change-Id: I03c97b22d92bcf0760b2b9ec627609624a0b3695
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 19:37:58 +00:00
Leena Miettinen
1e2939916e Qt Quick Designer: Fix UI text
Fix capitalization, punctuation, style, and typos.

Task-number: QTCREATORBUG-24873
Change-Id: Iecf7781d604b799563457cf000ab5f48e06b251c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-09 09:56:49 +00:00
Henning Gruendl
6a1f51b195 QmlDesigner: Add button to component specifics
* Add a button to component specifics for simpler access to the
  component. Currently it is only possible to access a component via
  the context menu "Go into Component" or shortcut F2.
* Add image template
* Fix other templates
* Cleanup component specifics and introduce nested sections

Task-number: QDS-3062
Task-number: QDS-2358
Change-Id: I6b245b013fbf4b960509b0a357ae62d20e0383cc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-06 09:52:29 +00:00
Miikka Heikkinen
50405d7153 QmlDesigner: Fix 3D material preview when QtQuick3D is not imported
3D material preview is not dependent on QtQuick3D import in the open
QML document, so we can enable it even when QtQuick3D is missing.

Change-Id: I5cb35ef403599704684ebe87c81cd949f828ad00
Fixes: QDS-2912
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-11-06 09:21:33 +00:00
Henning Gruendl
f2883c19b1 QmlDesigner: Add lock feature support to 3D editor
Added lock feature support for 3D editor. Also refactored the hide
support, since the two use largely similar logic.

Task-number: QDS-2915
Change-Id: I627848f3a3a73881427a03aeec6793fd26a1885a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-06 09:19:05 +00:00
David Schulz
30b6147e80 Debugger: fix dumper for msvc release builds
... for std::vector and std::string.

Change-Id: I5c823b6c1b7b510344eeea4e1d5db0791d5c8e53
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-06 08:13:35 +00:00
Assam Boudjelthia
4035fc2433 Android: update Sdk tools links and build-tools version
Fixes: QTCREATORBUG-24621
Change-Id: Id1b11452631612bc2b03af1d23cb78bc9b439316
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
2020-11-05 14:47:34 +00:00
Jarek Kobus
c0408ed52e Compile fixes with Qt 6
Change-Id: Ia5335bef6aeaff3ce12339db52d96793ff588824
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-05 08:14:55 +00:00
Henning Gruendl
241b45005a QmlDesigner: Update icon font
* Add rotation icon

Change-Id: Id1a0ae47edc10370c44fdc39082a2cd0bc9be4cb
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-04 10:36:28 +00:00
Mahmoud Badri
1bb89a5e8d QmlDesigner: Fix font list drop down
Fix: Font dropdown is empty and doesn't show neither default nor custom
fonts.

Fixes: QDS-3043
Change-Id: I1df179a1627b3a0f9d72004b5d970f09425ab472
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-04 09:42:48 +00:00
Mahmoud Badri
b1920cbb85 QmlDesigner: Fix SpinBox not respecting bounds on first load
Fixes: QDS-3047
Change-Id: I82fc39b7644cb5ef83a2c0e90b3e9121915c38be
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-04 09:31:04 +00:00
Henning Gruendl
658803379a QmlDesigner: Fix DoubleSpinBox drag functionality
Change-Id: Ic998b16c34d0b0d81b97b5883860cfe0f892818c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-03 18:48:19 +00:00
Henning Gruendl
f8808f6e9d QmlDesigner: Fix SpinBox input mouse selection
Task-number: QDS-3046
Change-Id: I27c8aac145157d050cb9cb70120670c6af31bd87
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-11-03 18:48:02 +00:00
Assam Boudjelthia
7b3accc78e Android: update ndk version
Update NDK version from 21.1.6352462 to 21.3.6528147, the most recent
one.

Change-Id: I0d5f33e78816464c6dab3303488aa353662bff47
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-02 08:29:45 +00:00
Henning Gruendl
985f6073da QmlDesigner: Fix ColorEditor dragging
Fix ColorEditor dragging by preventing that the mouse event gets stolen
from the Flickable underneath.

Task-number: QDS-2955
Change-Id: I3950d8fce3d3b59980a01f1c96bdb55aab56f263
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-28 12:49:45 +00:00
Assam Boudjelthia
1f9124c976 CMake: update project templates to work with Android for Qt 6
Qt 6 introduces qt_add_executable() function, which for Android
make sure to call few Android specific functions like:
* qt_android_generate_deployment_settings()
* qt_android_add_apk_target()
* qt_android_apply_arch_suffix()

Using add_library() only the user would otherwise need to reimplement
what's already implemented in add_qt_gui_executable().

Task-number: QTCREATORBUG-24681
Change-Id: Iec3984139844fe1cbac2d9a583b3c40bdaa308a0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-26 10:42:06 +00:00
Henning Gruendl
15db0bb173 QmlDesigner: Rework SpinBox dragging functionality
* Replace DragHandler with MouseArea due to the DragHandler not being
  able to accept MouseEvents
* Replace TapHandler with MouseArea due to MouseArea stealing press
  signals from TapHandler, but needed to get press events due to
  removal of DragHandler
* Add functionality to keep cursor in place while dragging
* Keep ActionIndicator visible while dragging
* Fix qsTr in RectangleSpecifics

Change-Id: I6558623287e1864359128d4194c9db78736ee3a4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 10:37:47 +00:00
Thomas Hartmann
28022d8e04 QmlDesigner: Remove Quick3D dependencies from ModelNode2DImageView.qml
Change-Id: Idf19019dbeebf8f3f09309a724727a4aa643ce25
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-23 10:58:58 +00:00
Henning Gruendl
73a26c0039 QmlDesigner: Update icon font
* Add pin and unpin icons

Change-Id: I42773d3f86f68d9bc638fa27500fb0b1b4e5d35d
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-22 06:46:57 +00:00
David Schulz
3b611e07f7 Debugger: prevent calling functions with gdb on windows
and adjust tests accordingly

Change-Id: I172e08cfccc248eea06a94208c9e8e312d69e334
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 11:15:40 +00:00
Eike Ziller
cc6f35016a Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: I6aa2cb51dcbb4d76238a2ed8603bf57a35ee4fd6
2020-10-21 09:10:50 +02:00
Miikka Heikkinen
6b8d8e414a QmlDesigner: Port 3D edit view to Qt6
Task-number: QDS-2899
Change-Id: Iedbe5e8561e5ab71ef32922e69da43cd3cc57e90
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 14:55:43 +00:00
Mahmoud Badri
83da45adde QmlDesigner: Remove AnnotationTool
Remove AnnotationTool from FormEditor's selected item's tools.

Change-Id: I797ed4002d14c04956aaeb5d779f1cf3f326f849
Fixes: QDS-2970
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 07:57:36 +00:00
Eike Ziller
f21d0b531f Fix github actions for Qt Creator plugin wizard
For Qt Creator 4.13
- rename directory to 'workflows'
- use MSVC 2019 for Qt
- fix Qt Creator platform names
- don't use GitHub's now deprected set-env

Fixes: QTCREATORBUG-24412
Change-Id: Ifdd3e95da74fef4ad9f65ae2c084ff82b2ca1972
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-19 13:48:56 +00:00
Marco Bubke
d1b0c12d6b QmlDesigner: Add image cache
The image cache is saving images and icon of this images in a sqlite
database. If there are no images they are generated in the backgound.
The icons are fetched by item library.

Task-number: QDS-2782
Task-number: QDS-2783
Task-number: QDS-2858
Change-Id: I5a32cccfef7f8fd8eb78902605a09f5da18ce88e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-16 10:01:21 +00:00
Thomas Hartmann
5edac46edb QmlDesigner: Fix UrlChooser
Change-Id: Ie5a6297cf29dd6e9a120293346431c497805a28e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-15 17:03:49 +00:00
Marco Bubke
3e9e768b35 QmlDesigner: Bump the C++ version to 17 for the qml puppet too
Task-number: QTCREATORBUG-24684
Change-Id: I2502593d45f93b36162a4009cca238a83da2dc53
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-14 16:59:20 +00:00
Henning Gruendl
2860e57112 QmlDesigner: Add lock functionality to navigator
* Update icon font and change related theme and constants files
* Add locked column to Navigator
* Add auxiliary property "locked"
* Integrate locked feature into the following components:
  * Transition Editor
  * Connection Editor
  * Form Editor
  * Text Editor
  * Timeline
  * Navigator
  * State Editor

Task-number: QDS-826
Change-Id: Ibf3ae96e0d5daeb1ab00279b94df5aaabe75e0bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 15:24:55 +00:00
Miikka Heikkinen
47714c38c6 QmlDesigner: Return placeholder preview image for non-visual components
Preview image is returned when a 2D item render results in a blank
image.

Also improved device pixel ratio handling. No longer always render
preview at 2x ratio, if not needed.

Change-Id: I67b7563dffea523ea85be23b6a0e8b802c0f03fb
Fixes: QDS-2893
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-10-12 07:33:56 +00:00
Thomas Hartmann
29c833d54f QmlDesigner: Implement different render path for Qt 6
When building with Qt 6 or if qmlpuppet_unifiedRenderPath is set
in the environment we switch to a different render path.
In this case we use QQuickWindow::grabWindow() and render the root item.
No composition is done in the Qt Creator process anymore.
This is a similar approach we already take for the 3D view.
Performance is acceptable and we fix rendering issues related to
effects and layers.

Change-Id: Ic963eca047e0bf16ca3a099ec94658ae2af0fb63
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-09 15:13:39 +00:00
hjk
41a51a63f5 ClangCodeModel, Puppet, CrashHandler: Compile with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ic65e7a5dce0a512f48fb70915b9443ef7df2b787
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 11:16:09 +00:00
Aleksei German
65ca1301de QmlDesigner: MCU Metadata improvements
- Introduced allowChildren switch

Task: QDS-2794

Change-Id: Ie992fb173e8eacb27b10679d5ff28238277aa346
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-08 08:01:16 +00:00
Christian Stenger
9dbda24bca Dumper: Fix displaying intrinsic types in cdb
Change-Id: Id0089017912a8d5de0f822fed56231f291859bed
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-07 12:42:17 +00:00
Aleksei German
00c07ca53e QmlDesigner: MCU configurations metadata
-Removed c++ hardcoded info about QDS MCU restrictions
 -Instead replaced it with dynamically loaded qml files
 -Replaced QLists with QSet/QHash to improve performance

Task: QDS-2794

Change-Id: Ifc23d1299155001b6573dc0ed789dda5d2cfaf24
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-06 14:10:04 +00:00
Thomas Hartmann
a53238e91c QmlDesigner.qml2puppet: Fix build with Qt6
Change-Id: If02714c44946d0a87a28c2ed505f860a593aef79
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 13:49:46 +00:00
Thomas Hartmann
469e7a7edf QmlDesigner.qml2puppet: Fix build with Qt6
Change-Id: Ib9580fa1b6c1699e830898234b286f3ee999d477
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 13:49:24 +00:00
Christian Kandeler
b55825a420 ProjectExplorer: Clean up variables
Global variables with names such as "CurrentProject*", "CurrentKit*" etc
are harmful, because the term "current project" as used in Qt Creator
does not refer to the "active project", but simply stands for the
project that contains the node that is currently selected in the project
tree, which in turn may or may not correspond to the current editor
document, depending on the "sync with editor" setting. In other words,
the "current project" is almost a random value with little meaning
outside the project tree itself.
Therefore, we remove "CurrentProject*" and friends, except the ones that
are currently intentionally in use. The latter get renamed to
"CurrentDocument:Project*", so their purpose becomes clear. Their old
names are kept around for backward compatibility, but are not suggested
by the variable chooser anymore, so new usages are unlikely and we can
remove them at some point.
We also add some ActiveProject* variants that have been requested in the
past.
Also remove the "CurrentSession" prefix that was deprecated six years
ago.

Fixes: QTCREATORBUG-12724
Fixes: QTCREATORBUG-24606
Change-Id: Ibba5d0e0ce3d2beb444a5eec01fbb9b745d90a1d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-02 07:49:08 +00:00
Jeremy Ephron
b9323cccc0 Debugger: Use GetName instead of GetDisplayTypeName
In the newest version of LLDB, they remove anonymous and inline
namespaces from their display name, which breaks all debugger helper
code on Macs with the newest version of Xcode, since Qt Creator logic
determines libc++ vs. libstdc++ by the presence of the "__1" inline
namespace.

Change-Id: I139d0654ffbc9dec2e42b40eaad92ea2e3c067c0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-01 10:29:12 +00:00
Miikka Heikkinen
a3e92da8b8 QmlPuppet: Force QApplication use in puppet if charts is imported
Qt Charts requires QApplication, so force that on when QtCharts import
is detected.

Change-Id: Ie725cb0714f2816a34374e46de71b82f00ce6239
Fixes: QDS-2842
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-29 14:00:56 +00:00
Miikka Heikkinen
8d6ee2509d QmlDesigner: Show tooltip preview image for Textures with sourceItem
For non-component sourceItems, the preview shown is simply whatever
image has been stored for form editor for that item.

If the sourceItem is component, the preview image is the same as
sourceItem's preview image, as the form editor image for components
often includes unnecessary empty space.

Note that currently the image stored for form editor doesn't include
child items, so this is not a perfect solution. It is however in line
with what form editor shows for the texture.

Change-Id: I3c0c629ca5e7fa25dbcb390c53e3865e34d5e729
Fixes: QDS-2824
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-29 09:58:21 +00:00
Miikka Heikkinen
36a8b8ad99 QmlDesigner: Add navigator tooltip for 2D components
This enables showing preview tooltip for 2D (Item based) components.

We render the component from scratch for this purpose instead of using
existing renders done for form editor to ensure preview doesn't
include any local changes to component.

Also cache tooltips as QPixmaps in NodeInstanceView instead of QImages
to avoid unnecessary image to pixmap conversions when using cached
data.

Change-Id: I3082c5c846f605a765a81408767266d1ff7a12d7
Fixes: QDS-2762
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-29 09:58:04 +00:00