Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
        src/corelib/Qt5CoreConfigExtras.cmake.in
        src/corelib/Qt5CoreMacros.cmake
        src/dbus/Qt5DBusConfigExtras.cmake.in
        src/widgets/Qt5WidgetsConfigExtras.cmake.in

Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7

1 files changed, 8 insertions, 0 deletions

diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.h b/src/plugins/platforms/windows/qwindowsnativeinterface.h
index ce395dc5a4..90ba7a44c9 100644
--- a/src/plugins/platforms/windows/qwindowsnativeinterface.h
+++ b/src/plugins/platforms/windows/qwindowsnativeinterface.h
@@ -65,6 +65,8 @@ class QWindowsNativeInterface : public QPlatformNativeInterface
 {
     Q_OBJECT
     Q_PROPERTY(bool asyncExpose READ asyncExpose WRITE setAsyncExpose)
+    Q_PROPERTY(bool darkMode READ isDarkMode STORED false NOTIFY darkModeChanged)
+    Q_PROPERTY(bool darkModeStyle READ isDarkModeStyle STORED false)
     Q_PROPERTY(QVariant gpu READ gpu STORED false)
     Q_PROPERTY(QVariant gpuList READ gpuList STORED false)
 
@@ -92,6 +94,9 @@ public:
     bool asyncExpose() const;
     void setAsyncExpose(bool value);
 
+    bool isDarkMode() const;
+    bool isDarkModeStyle() const;
+
     QVariant gpu() const;
     QVariant gpuList() const;
 
@@ -109,6 +114,9 @@ public:
 
     QFunctionPointer platformFunction(const QByteArray &function) const override;
 
+Q_SIGNALS:
+    void darkModeChanged(bool);
+
 private:
     static QWindowsWindowFunctions::WindowActivationBehavior m_windowActivationBehavior;
 };