Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

2 files changed, 3 insertions, 3 deletions

diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp
index a3c9746869..6fadea5d28 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp
@@ -154,7 +154,7 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuLayoutItem &i
     while (!arg.atEnd()) {
         QDBusVariant dbusVariant;
         arg >> dbusVariant;
-        QDBusArgument childArgument = dbusVariant.variant().value<QDBusArgument>();
+        QDBusArgument childArgument = qvariant_cast<QDBusArgument>(dbusVariant.variant());
 
         QDBusMenuLayoutItem child;
         childArgument >> child;
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
index c0da9d8370..f6acf00f39 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
@@ -109,7 +109,7 @@ public:
     QVariant themeHint(ThemeHint hint) const override;
 
     QIcon fileIcon(const QFileInfo &fileInfo,
-                   QPlatformTheme::IconOptions iconOptions = nullptr) const override;
+                   QPlatformTheme::IconOptions iconOptions = { }) const override;
 
     const QPalette *palette(Palette type = SystemPalette) const override;
 
@@ -134,7 +134,7 @@ public:
     QGnomeTheme();
     QVariant themeHint(ThemeHint hint) const override;
     QIcon fileIcon(const QFileInfo &fileInfo,
-                   QPlatformTheme::IconOptions = nullptr) const override;
+                   QPlatformTheme::IconOptions = { }) const override;
     const QFont *font(Font type) const override;
     QString standardButtonText(int button) const override;