Fix against latest qtbase changes

Change-Id: I18127718b1d9899678d26866f940e44990878d26
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 5 insertions, 3 deletions

diff --git a/src/assistant/assistant/bookmarkmodel.cpp b/src/assistant/assistant/bookmarkmodel.cpp
index e80842d45..557e2e26c 100644
--- a/src/assistant/assistant/bookmarkmodel.cpp
+++ b/src/assistant/assistant/bookmarkmodel.cpp
@@ -28,6 +28,7 @@
 #include "bookmarkmodel.h"
 #include "bookmarkitem.h"
 
+#include <QtCore/QIODevice>
 #include <QtCore/QMimeData>
 #include <QtCore/QStack>
 
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>
diff --git a/src/qdbus/qdbusviewer/propertydialog.cpp b/src/qdbus/qdbusviewer/propertydialog.cpp
index d9c7837f3..4892f7162 100644
--- a/src/qdbus/qdbusviewer/propertydialog.cpp
+++ b/src/qdbus/qdbusviewer/propertydialog.cpp
@@ -77,7 +77,7 @@ void PropertyDialog::addProperty(const QString &aname, int type)
     propertyTable->setItem(rowCount, 0, nameItem);
 
     QTableWidgetItem *valueItem = new QTableWidgetItem;
-    valueItem->setData(Qt::DisplayRole, QVariant(type, /* copy */ 0));
+    valueItem->setData(Qt::DisplayRole, QVariant(QMetaType(type), /* copy */ 0));
     propertyTable->setItem(rowCount, 1, valueItem);
 }