Replaced QApplication from QtWidgets by QGuiApplication from QtGui

qmetaobject/src/qtdeclarative.rs

@@ -28,7 +28,7 @@ cpp! {{
     #include <memory>
     #include <QtQuick/QtQuick>
     #include <QtCore/QDebug>
-    #include <QtWidgets/QApplication>
+    #include <QtGui/QGuiApplication>
     #include <QtQml/QQmlComponent>
 
     struct SingleApplicationGuard {
@@ -47,12 +47,12 @@ cpp! {{
     };
 
     struct QmlEngineHolder : SingleApplicationGuard {
-        std::unique_ptr<QApplication> app;
+        std::unique_ptr<QGuiApplication> app;
         std::unique_ptr<QQmlApplicationEngine> engine;
         std::unique_ptr<QQuickView> view;
 
         QmlEngineHolder(int &argc, char **argv)
-            : app(new QApplication(argc, argv))
+            : app(new QGuiApplication(argc, argv))
             , engine(new QQmlApplicationEngine())
         {}
     };

qttypes/build.rs

@@ -228,7 +228,6 @@ fn main() {
     };
     link_lib("Core");
     link_lib("Gui");
-    link_lib("Widgets");
     #[cfg(feature = "qtquick")]
     link_lib("Quick");
     #[cfg(feature = "qtquick")]

qttypes/src/qtcore/qvariant.rs

@@ -1,8 +1,6 @@
 use std::fmt;
 
-use crate::{
-    cpp, cpp_class, QByteArray, QDate, QDateTime, QString, QStringList, QTime, QUrl, QVariantList,
-};
+use crate::{cpp, cpp_class, QByteArray, QDate, QDateTime, QString, QStringList, QTime, QUrl, QVariantList, QVariantMap};
 
 cpp_class!(
     /// Wrapper around [`QVariant`][class] class.
@@ -30,6 +28,42 @@ impl QVariant {
         })
     }
 
+    /// Wrapper around [`toDouble()`][method] method.
+    ///
+    /// [method]: https://doc.qt.io/qt-5/qvariant.html#toDouble
+    pub fn to_double(&self) -> f64 {
+        cpp!(unsafe [self as "const QVariant*"] -> f64 as "double" {
+            return self->toDouble();
+        })
+    }
+
+    /// Wrapper around [`toMap()`][method] method.
+    ///
+    /// [method]: https://doc.qt.io/qt-5/qvariant.html#toMap
+    pub fn to_map(&self) -> QVariantMap {
+        cpp!(unsafe [self as "const QVariant*"] -> QVariantMap as "QVariantMap" {
+            return self->toMap();
+        })
+    }
+
+    /// Wrapper around [`toList()`][method] method.
+    ///
+    /// [method]: https://doc.qt.io/qt-5/qvariant.html#toList
+    pub fn to_list(&self) -> QVariantList {
+        cpp!(unsafe [self as "const QVariant*"] -> QVariantList as "QVariantList" {
+            return self->toList();
+        })
+    }
+
+    /// Wrapper around [`toString()`][method] method.
+    ///
+    /// [method]: https://doc.qt.io/qt-5/qvariant.html#toString
+    pub fn to_qstring(&self) -> QString {
+        cpp!(unsafe [self as "const QVariant*"] -> QString as "QString" {
+            return self->toString();
+        })
+    }
+
     /// Wrapper around [`userType()`][method] method.
     ///
     /// [method]: https://doc.qt.io/qt-5/qvariant.html#userType
@@ -137,6 +171,17 @@ impl From<QVariantList> for QVariant {
     }
 }
 
+impl From<QVariantMap> for QVariant {
+    /// Wrapper around [`QVariant(const QVariantMap &)`][ctor] constructor.
+    ///
+    /// [ctor]: https://doc.qt.io/qt-5/qvariant.html#QVariant-22
+    fn from(a: QVariantMap) -> QVariant {
+        cpp!(unsafe [a as "QVariantMap"] -> QVariant as "QVariant" {
+            return QVariant(a);
+        })
+    }
+}
+
 impl From<QStringList> for QVariant {
     /// Wrapper around [`QVariant(const QStringList &)`][ctor] constructor.
     ///