diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-06-12 12:33:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-06-12 12:33:26 +0200 |
| commit | ea56417410d72a359c3133af480f5489fe33473f (patch) | |
| tree | 14f77ef5f42a4841af2bc112ffff98e558ed74b7 /src/plugins/designer | |
| parent | 74f77f6407589048878b9e61d2da7a9d44bb3c1d (diff) | |
| parent | 890debd65806375e0a231c87468ef13afa837cc6 (diff) | |
Merge remote-tracking branch 'origin/11.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
Change-Id: Ide0650d70d5dbd32a5492c8db24089925251af12
Diffstat (limited to 'src/plugins/designer')
| -rw-r--r-- | src/plugins/designer/formeditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/designer/formeditor.cpp b/src/plugins/designer/formeditor.cpp index 96e65796500..ab2dd3ddd1e 100644 --- a/src/plugins/designer/formeditor.cpp +++ b/src/plugins/designer/formeditor.cpp @@ -647,7 +647,7 @@ ActionContainer *FormEditorData::createPreviewStyleMenu(QActionGroup *actionGrou QString name = menuId; name += dot; const QVariant data = a->data(); - const bool isDeviceProfile = data.type() == QVariant::Int; + const bool isDeviceProfile = data.typeId() == QVariant::Int; if (isDeviceProfile) { name += deviceProfilePrefix; name += dot; |