diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2020-08-18 17:08:01 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2020-08-18 17:31:58 +0200 |
| commit | d306ba408d7416dcd1d9127afa1c4a200b24bb59 (patch) | |
| tree | 3808677d41ffad4e4b1321dd4acc3e0b82100f3a /src/designer | |
| parent | 5cc0dabf472ae6ef962473930ab40f11ed29ebf1 (diff) | |
| download | qttools-d306ba408d7416dcd1d9127afa1c4a200b24bb59.tar.gz | |
Fix against latest qtbase changes
Change-Id: I18127718b1d9899678d26866f940e44990878d26
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/designer')
| -rw-r--r-- | src/designer/src/components/taskmenu/itemlisteditor.cpp | 4 | ||||
| -rw-r--r-- | src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.cpp b/src/designer/src/components/taskmenu/itemlisteditor.cpp index 8aca0916d..2f711b6b6 100644 --- a/src/designer/src/components/taskmenu/itemlisteditor.cpp +++ b/src/designer/src/components/taskmenu/itemlisteditor.cpp @@ -215,7 +215,7 @@ void AbstractItemEditor::resetProperty(QtProperty *property) if (role == ItemFlagsShadowRole) prop->setValue(QVariant::fromValue(defaultItemFlags())); else - prop->setValue(QVariant(prop->valueType(), nullptr)); + prop->setValue(QVariant(QMetaType(prop->valueType()), nullptr)); prop->setModified(false); setItemData(role, QVariant()); @@ -247,7 +247,7 @@ void AbstractItemEditor::updateBrowser() if (role == ItemFlagsShadowRole) val = QVariant::fromValue(defaultItemFlags()); else - val = QVariant(int(prop->value().userType()), nullptr); + val = QVariant(QMetaType(prop->value().userType()), nullptr); prop->setModified(false); } else { prop->setModified(true); diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp index 71051bdbe..9f44c5d00 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp @@ -41,6 +41,7 @@ #include <QtCore/qsortfilterproxymodel.h> #include <QtCore/qabstractitemmodel.h> +#include <QtCore/qiodevice.h> #include <QtCore/qlist.h> #include <QtCore/qtextstream.h> #include <QtCore/qregularexpression.h> |