Commit Graph

6279 Commits

Author SHA1 Message Date
hjk
e62d364d97 Debugger: Adapt QVariantMap dumper and test to Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: I4e157a18ce5ff06a732fccbec1ec3d2ff507b961
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-03 15:22:24 +00:00
Aleksei German
b7628865fb QmlDesigner: Fix for Image Browser cancel button
Task: QDS-3243

Change-Id: I25ead59b39f33927bd7283b19da3b4910d9ecf83
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-03 14:06:43 +00:00
Christian Stenger
7fbc926c64 Dumper: Adapt Qt handling for Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I62f2a4d91ed2f95ac167b836ea0e811599d0655f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-03 14:03:28 +00:00
hjk
f946e5b356 Debugger: Consolidate some string data extraction helper functions
Change-Id: Icfa395de5237e0f58e63b3ca0d88ff8c9a1998a9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-03 10:55:06 +00:00
hjk
08a1117c26 Debugger: Extend and fix QPolygon dumper and test for Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ia2e43d15263e18698d9db6b4d23fa553c7b7ae5b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-02 15:22:35 +00:00
hjk
8e0780e28c Debugger: Fix QHash dumper for empty containers
Task-number: QTCREATORBUG-24098
Change-Id: I2bf15504ffefdb458a5d93c9185f8b695f120189
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-02 15:16:55 +00:00
hjk
25a89250f6 Debugger: Adapt QVariant dumper and tests to Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: I9543bad098bb11d21079c1e2711b639bde3873b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-02 10:16:33 +00:00
Alessandro Portale
6c14b4dfaf QtQuick Application Wizards: Set default Controls Style to "Material"
The Controls Style "Default" that is currently by default in the
generated qtquickcontrols2.conf is not present in Qt 6. That leads to
QML runtime errors and aborting applications with Qt 6.

Let's switch the default to "Material" which is available since Qt 5.7
and present in Qt 6.

Fixes: QTCREATORBUG-25027
Change-Id: Ic8b631b771487624d7459a276d290b80c7ad8be0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-02 07:38:25 +00:00
hjk
e1790ed9d0 Debugger: Fix some dumpers with namespaced Qt
This makes the use of '@' prefixes in split('{@QString}'...) etc
mandatory, thereby removing the guessing on whether namespaces apply
or not on the dumper 'core' side, and removes the guessing on
whether dropping the '@' 'works' on the individual dumper implementation
side.

Amends 1074c2ffce.

Change-Id: I44611eb09557638dec12d2e2f78cdaeac0bbd449
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-01 14:59:06 +00:00
hjk
dd2a880b8c Debugger: Simplify QByteArray dumper again
Change-Id: Id2622db1e855c7706260796b633f06d0e5da0503
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-01 13:57:06 +00:00
hjk
e556463dc7 Debugger: Fix value endianness of register data with LLDB
Fixes: QTCREATORBUG-25009
Change-Id: I4de44cee6ef322791e3f4058a369548bfb210e77
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-01 10:09:44 +00:00
Thomas Hartmann
35380afb93 QmlDesigner: Disable rich text for TextInput
TextInput does not support rich text.

Task-number: QDS-2769
Change-Id: I6ae9862f65c866cce2975f7f53cb2683f41f0d9a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-01 09:02:20 +00:00
Assam Boudjelthia
68e20abfef Android: partially revert 4035fc2433
The links for the new sdk tools were using a different folder structure
in the zip archive which are different from the previous packages and
from what QC expects.

Fixes: QTCREATORBUG-25017
Change-Id: Id288d5cc59a3bad87ce2c795fba28b7ebfa027e5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-30 17:29:26 +00:00
Christian Kandeler
4f45319e80 QmlDesigner: Fix warnings
Change-Id: I818bd2d6a7512609ee7f7c1345ba314ab304850d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-30 16:37:13 +00:00
Miikka Heikkinen
a1e9e6b70b QmlPuppet: Fix preview tooltip image creation for material components
There is an unknown issue causing the first premade material from
QtQuick3D.Materials library encountered in the scene to fail to load
properly as a component. In scene creation this is worked around by
falling back on primitive creation, but the same issue prevents
loading the component for preview image generation purposes. Luckily,
materials can be shared freely between views, so we don't need to
actually load the component in this case. We can use the existing
material instance just like with non-component materials.

As a side effect, this change also fixes the issue where premade
custom material previews didn't reflect the changes in material
properties, like other materials do.

Change-Id: I7f1d6863fe96734a610d725f2f71e252f03a4428
Fixes: QDS-3114
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-30 15:57:29 +00:00
hjk
398a74b027 Debugger: Adapt QObject name dumper to Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: Iee8a71eda4c15b3cd36e569805fef769f6eb090f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-30 14:30:13 +00:00
hjk
e65b9cde28 Debugger: Partially adapt QObject dumper to Qt 6
This makes meta method and property names visible again.

Task-number: QTCREATORBUG-24098
Change-Id: I2e0522396a5e91be43ae6b850217b9153b29a962
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-30 12:02:29 +00:00
Miikka Heikkinen
d3412cfcdc Add optional fps counter to 3D edit view
Currently it is enabled via #define FPS_COUNTER in
qt5informationnodeinstanceserver.cpp

Change-Id: If9af313232fc91fca674a43c7ca70b04db7e59f7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-11-27 14:24:40 +00:00
hjk
2bb32ed7a3 Debugger: Use Values instead of addresses in vectorDataHelper
Also rename it to vectorData, in line with byteArrayData and stringData

Change-Id: I91a4ddba272fcada3e451680ba5a5a756f7a976e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-27 13:58:30 +00:00
hjk
80fdbfff05 Debugger: Use qArrayData instead of qArrayDataHelper
Change-Id: I97a6c428e6b09232c420e2b8cb3b5b31588c949f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-27 13:58:04 +00:00
Christian Kandeler
013f2a9d73 Wizards: Prevent deprecation warning in generated QtQuick application
Fixes: QTCREATORBUG-25002
Change-Id: Ic118e98a48913acc2abc841b985685059ef3741a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-27 12:31:16 +00:00
Miikka Heikkinen
dd279759dd QmlPuppet: Use QQuickRenderControl to render 2D views
Port QQuickRenderControl rendering used for 3D edit view also for
2D views.

This also fixes the issue of only partially rendered form editor
view for root items with non-origin position by adjusting the
position to 0,0 on the puppet side via an extra injected item.
As a result of the root item always being rendered at origin,
the visualization of the root item offset is no longer visible in
the form editor (the checkerboard background item).

Change-Id: Ide29510ef52513340d205ed35ac35c8cce66715c
Fixes: QDS-3159
Fixes: QDS-3175
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-27 12:28:57 +00:00
Miikka Heikkinen
ae15780f84 QmlPuppet: Hide 3D edit view render window
Rendering is now done using QRhi private API and QQuickRenderControl.

In addition, input event handling was changed to use sendEvent instead
of postEvent for our fake mouse events, as mouse event position
gets corrupted somehow if event is handled asynchronously when the
window is hidden.

Change-Id: Ia2466622cd4b60e3f73e0ad3e7e4da7c7c335451
Fixes: QDS-3125
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-11-27 12:11:28 +00:00
Christian Stenger
d31f2219fd Tests: Fix QString dumper test on Windows
Partially reverts 93fedb2c9.

Change-Id: I82c40c41a2d3e72774f046f91845fe2dc0745aad
Reviewed-by: hjk <hjk@qt.io>
2020-11-26 08:56:45 +00:00
hjk
0ce92b3ac7 Debugger: Adapt QXmlAttributes dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I67ee0fae1308d20b474fe0dd565b46d2a83dd5e3
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-26 08:41:23 +00:00
hjk
93fedb2c9e Debugger: Disable Q{Typed,Byte,}ArrayData dumpers
Mainly because it is getting in the way of the string data dumper
consolidation. We can re-enable that afterwards. The loss here is
limited either way as QArrayData is only an implementation detail
of some Qt container, rarely, if ever used by end users.

Change-Id: I7e9074434f84da536d603b6a163a3a039facc8fc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 13:25:35 +00:00
hjk
35c2d51ec9 Debugger: Adapt QDate{,Time} dumper and test to Qt6
Essentially removing the parts that are gone in Qt6

Task-number: QTCREATORBUG-24098
Change-Id: I49f7ed8ea8e568803850bd4a0118b690248013af
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-25 13:06:28 +00:00
hjk
1f75893eba Debugger: Adapt QDir dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I5346a8eb129dd042279754748b26852acf082f94
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-25 12:45:57 +00:00
hjk
79df1c0804 Debugger: Use Values instead of addresses in putStringValue
Change-Id: I31a3c1a326d777d9e7081552d5a956e8e2882dcf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 11:41:24 +00:00
hjk
1074c2ffce Debugger: Remove shortcut to get known type sizes in dumpers
This was incomplete, can conceptionally not be complete, and most
of the sizes were wrong for Qt 6.

Change-Id: Id107b30dd6707b280c18a5d2065a4ec9c39fb035
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 11:36:46 +00:00
hjk
961c660ebd Debugger: Use Values instead of addresses in encodeByteArrayHelper
Change-Id: I4ee44f14b5b0d6afddb305a923d25a737f0d3d97
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 11:36:26 +00:00
hjk
147ca66932 Debugger: Rename byteArrayDataHelper to qArrayDataHelper in dumpers
It's generic, and operating on QArrayData (-subclasses).

Change-Id: Ieedc0f1e3f573aeeb422eb9516d4634e6e0da4b9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 11:35:16 +00:00
Thomas Hartmann
4c4a25d08e QmlDesigner: To not render huge items
Rendering large items takes too much memory.

Change-Id: I19084d707989e846fc446e24da228bc73c024013
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-24 19:48:07 +00:00
hjk
1c244bd623 Debugger: Adapt dumper helper for embedded QString members for Qt6
This fixes the QUrl dumper.

Task-number: QTCREATORBUG-24098
Change-Id: I2dbc2f477c33bc0c7337e8a925dd0a35d15aa31f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 08:52:44 +00:00
hjk
8f338eb04f Debugger: Adapt QVarLengthArray dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ic93e15bd474d42be49de34c87d56ffbc07757bdb
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 08:52:38 +00:00
hjk
56b2158500 Debugger: Adapt QRegion dumper and test to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ie9c75c779595a981e75f20e73bfaccb5d24cf16b
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 08:52:31 +00:00
hjk
5ad9b00cf7 Debugger: Adapt QImage and QPixmap dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ib9b6c824df67d18d9b4282340f2ab0d4a5bae837
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 08:21:15 +00:00
hjk
d0991ae5ae Debugger: Simplify user side of QString dumper code
Move the version dependency into the dumper base instead.
This also fixes the QFileInfo display, but not yet QFile.

Change-Id: Ia2cb75b2a74cbbd4bb2d6ede2178d96792883912
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 07:13:39 +00:00
hjk
c80313f777 Debugger: Adapt QHash dumper for Qt6
This is a completely new structure, also effective order when
iterating is completely different.

QHashIterator doesn't work yet.

Task-number: QTCREATORBUG-24098
Change-Id: I917cacf7952d9d54a31d14a0691213ab944d0d8f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-23 12:26:24 +00:00
Aleksei German
181fd57cc4 QmlDesigner: Fix for rotation cursor
- Added new icons to icon font
 - Uses new drawing method for rotation cursor

Task: QDS-3131

Change-Id: Ifa8dda2630794694dd262396ca314a9b4e6675ad
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-20 10:49:52 +00:00
Marco Bubke
9b6944086b MultiLanguage: Add image generation for excel export
Change-Id: Ied15381d94c391c86438c66fe88f755421bb3492
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-19 13:22:44 +00:00
hjk
113fc9d060 Debugger: Adapt QStack dumper to Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: Ibbe2f0c1faface1a1d6893eb0cb3987e5dff1b1a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-19 10:22:40 +00:00
hjk
92cd7f3c06 Debugger: Adapt QMap and QMultiMap dumper to Qt6
Chicken out of the QStringList == QList<QString> in Qt 6 dilemma
by using QList<QString> everywhere, that's not important for the
QMap test. value/key vs first/second nevertheless needs adaptation.

Task-number: QTCREATORBUG-24098
Task-number: QTCREATORBUG-23806
Change-Id: I4bdb8222978de7e7f1596be380e0fedc8f9d1a06
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-19 07:24:26 +00:00
Christian Kandeler
7aec256087 QmlDesigner & friends: Fix various new warnings
Change-Id: Ia5e3d47e70e1881e70652f090ccc61543535df4e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-18 17:05:51 +00:00
Alessandro Portale
caace5da7b TextEdtitor: Don't override SearchResultAlt1|2 in classic theme
Just use the defaults.

Change-Id: Iad655becbfc13dc793b336ea9d661ad861ef695a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-18 13:36:08 +00:00
Alessandro Portale
85e1e21dae TextEditor: Fix SearchResultAlt1|2 dark themes
Change-Id: Ie800352172a8dd31ccdb63de1904f46fcfe77d2f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-11-18 13:35:57 +00:00
Miikka Heikkinen
12f7df6a85 QmlPuppet: Remove effect preview support
The issue in QtQuick3D blocking effect previews (QTBUG-86616) is not
going to be fixed in Qt 5 anymore, and Effect was moved to QtQuick3D
from QtQuick3D.Effects in Qt 6, so this can't be written in Qt 5 and
Qt 6 compatible manner anyway. Removed the support for now as it needs
to be implemented differently if we want to enable effect previews in
the future.

Change-Id: Ic786608572c3350e22dab75366cb93586c29459a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-17 15:49:13 +00:00
Jarek Kobus
ad2d635a09 Get rid of deprecation warning when compiling against Qt 5.15
In Qt 5.15 the comparison operator for QVariant got deprecated.
Fix the warning by substituting comparison operator by custom
method.

Change-Id: I1a5c4ab6742a6d8d85f6cff5a73d5f49c2d5aa73
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-17 11:39:56 +00:00
Jarek Kobus
df9d1414b8 Don't cast QHoverEvent into QMouseEvent
Such a cast rely on the fact that some internal data
of both classes must match. Qt doesn't guarantee it.

Change-Id: I5c29af98e320b72b599c059a2827eb2e7d3843da
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-11-17 08:42:57 +00:00
Thomas Hartmann
0de8aab7ae QmlDesigner: Add missing stream read
Change-Id: I5a93a6ef37b9f0608e82b2b9d4453f792b813da1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-11-16 16:03:41 +00:00