add limited qmake support

Signed-off-by: Yuhang Zhao <[email protected]>
wangwenx190 · Aug 31, 2022 · 7a35b09 · 7a35b09
1 parent abf4b29
commit 7a35b09
Show file tree

Hide file tree

Showing 38 changed files with 352 additions and 77 deletions.
diff --git a/examples/example.rc b/examples/example.rc
@@ -26,6 +26,18 @@
 
 IDI_ICON1 ICON "example.ico"
 
+#if 0
+#if (defined(WIDGET_USE_QMAKE) || defined(QUICK_USE_QMAKE))
+#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+#endif
+#ifndef RT_MANIFEST
+#define RT_MANIFEST 24
+#endif
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "example.manifest"
+#endif
+#endif
+
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     1,0,0,0
 PRODUCTVERSION  1,0,0,0

diff --git a/examples/mainwindow/main.cpp b/examples/mainwindow/main.cpp
@@ -39,6 +39,11 @@ int main(int argc, char *argv[])
 
     QApplication application(argc, argv);
 
+    // Must be called after QGuiApplication has been constructed, we are using
+    // some private functions from QPA which won't be available until there's
+    // a QGuiApplication instance.
+    FramelessHelper::Core::setApplicationOSThemeAware(true, false);
+
     FramelessConfig::instance()->set(Global::Option::WindowUseRoundCorners);
     FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow);
 

diff --git a/examples/openglwidget/main.cpp b/examples/openglwidget/main.cpp
@@ -76,6 +76,11 @@ int main(int argc, char *argv[])
 
     QApplication application(argc, argv);
 
+    // Must be called after QGuiApplication has been constructed, we are using
+    // some private functions from QPA which won't be available until there's
+    // a QGuiApplication instance.
+    FramelessHelper::Core::setApplicationOSThemeAware(true, false);
+
     FramelessConfig::instance()->set(Global::Option::WindowUseRoundCorners);
     FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow);
 

diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt
@@ -57,8 +57,10 @@ if(${QT_VERSION} VERSION_GREATER_EQUAL 6.2)
                               # There's some hope to get it supported in Qt 6.5.
     )
     qt_add_resources(Quick resources
-        PREFIX "/Demo"
-        FILES "images/microsoft.svg"
+        PREFIX
+            "/Demo"
+        FILES
+            "images/microsoft.svg"
     )
 endif()
 

diff --git a/examples/quick/main.cpp b/examples/quick/main.cpp
@@ -51,6 +51,11 @@ int main(int argc, char *argv[])
 
     QGuiApplication application(argc, argv);
 
+    // Must be called after QGuiApplication has been constructed, we are using
+    // some private functions from QPA which won't be available until there's
+    // a QGuiApplication instance.
+    FramelessHelper::Core::setApplicationOSThemeAware(true, true);
+
     FramelessConfig::instance()->set(Global::Option::WindowUseRoundCorners);
     FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow);
 
@@ -75,11 +80,11 @@ int main(int argc, char *argv[])
     }
 
     QQmlApplicationEngine engine;
-#if !QMLTC_ENABLED
+#if (!QMLTC_ENABLED && !defined(QUICK_USE_QMAKE))
     engine.addImportPath(FRAMELESSHELPER_STRING_LITERAL("../imports"));
 #endif
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 2, 0)) && !QMLTC_ENABLED
+#if (((QT_VERSION < QT_VERSION_CHECK(6, 2, 0)) || defined(QUICK_USE_QMAKE)) && !QMLTC_ENABLED)
     // Don't forget to register our own custom QML types!
     FramelessHelper::Quick::registerTypes(&engine);
 

diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+TARGET = Quick
+QT += qml quick quickcontrols2
+CONFIG -= embed_manifest_exe
+DEFINES += QUICK_USE_QMAKE
+HEADERS += settings.h
+SOURCES += settings.cpp main.cpp
+RESOURCES += resources.qrc
+win32: RC_FILE = ../example.rc
+include(../../qmake/core.pri)
+include(../../qmake/quick.pri)
diff --git a/examples/widget/main.cpp b/examples/widget/main.cpp
@@ -39,6 +39,11 @@ int main(int argc, char *argv[])
 
     QApplication application(argc, argv);
 
+    // Must be called after QGuiApplication has been constructed, we are using
+    // some private functions from QPA which won't be available until there's
+    // a QGuiApplication instance.
+    FramelessHelper::Core::setApplicationOSThemeAware(true, false);
+
     FramelessConfig::instance()->set(Global::Option::WindowUseRoundCorners);
     FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow);
 

diff --git a/examples/widget/widget.pro b/examples/widget/widget.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+TARGET = Widget
+QT += widgets
+CONFIG -= embed_manifest_exe
+HEADERS += widget.h
+SOURCES += widget.cpp main.cpp
+win32: RC_FILE = ../example.rc
+include(../../qmake/core.pri)
+include(../../qmake/widgets.pri)
diff --git a/include/FramelessHelper/Core/framelesshelpercore_global.h b/include/FramelessHelper/Core/framelesshelpercore_global.h
@@ -566,6 +566,7 @@ FRAMELESSHELPER_CORE_API void uninitialize();
 [[nodiscard]] FRAMELESSHELPER_CORE_API Global::VersionInfo version();
 FRAMELESSHELPER_CORE_API void registerInitializeHook(const Global::InitializeHookCallback &cb);
 FRAMELESSHELPER_CORE_API void registerUninitializeHook(const Global::UninitializeHookCallback &cb);
+FRAMELESSHELPER_CORE_API void setApplicationOSThemeAware(const bool enable, const bool pureQuick);
 } // namespace FramelessHelper::Core
 
 FRAMELESSHELPER_END_NAMESPACE

diff --git a/include/FramelessHelper/Core/private/chromepalette_p.h b/include/FramelessHelper/Core/private/chromepalette_p.h
@@ -25,14 +25,13 @@
 #pragma once
 
 #include "framelesshelpercore_global.h"
+#include "chromepalette.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 #include <optional>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class ChromePalette;
-
 class FRAMELESSHELPER_CORE_API ChromePalettePrivate : public QObject
 {
     Q_OBJECT

diff --git a/include/FramelessHelper/Core/private/micamaterial_p.h b/include/FramelessHelper/Core/private/micamaterial_p.h
@@ -25,14 +25,13 @@
 #pragma once
 
 #include "framelesshelpercore_global.h"
+#include "micamaterial.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 #include <QtGui/qbrush.h>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class MicaMaterial;
-
 class FRAMELESSHELPER_CORE_API MicaMaterialPrivate : public QObject
 {
     Q_OBJECT

diff --git a/include/FramelessHelper/Core/private/registrykey_p.h b/include/FramelessHelper/Core/private/registrykey_p.h
@@ -26,6 +26,8 @@
 
 #include "framelesshelpercore_global.h"
 #include <QtCore/qobject.h>
+#include <QtCore/qvariant.h>
+#include <optional>
 
 QT_BEGIN_NAMESPACE
 class QWinRegistryKey;
@@ -49,6 +51,15 @@ class FRAMELESSHELPER_CORE_API RegistryKey : public QObject
     Q_NODISCARD bool isValid() const;
 
     Q_NODISCARD QVariant value(const QString &name) const;
+    template<typename T>
+    Q_NODISCARD std::optional<T> value(const QString &name) const
+    {
+        const QVariant var = value(name);
+        if (var.isValid()) {
+            return qvariant_cast<T>(var);
+        }
+        return std::nullopt;
+    }
 
 private:
     Global::RegistryRootKey m_rootKey = Global::RegistryRootKey::CurrentUser;

diff --git a/include/FramelessHelper/Quick/private/framelessquickhelper_p.h b/include/FramelessHelper/Quick/private/framelessquickhelper_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include "framelesshelperquick_global.h"
+#include "framelessquickhelper.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 
@@ -35,7 +36,6 @@ QT_END_NAMESPACE
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
 struct QuickHelperData;
-class FramelessQuickHelper;
 
 class FRAMELESSHELPER_QUICK_API FramelessQuickHelperPrivate : public QObject
 {

diff --git a/include/FramelessHelper/Quick/private/framelessquickwindow_p_p.h b/include/FramelessHelper/Quick/private/framelessquickwindow_p_p.h
@@ -26,6 +26,7 @@
 
 #include "framelesshelperquick_global.h"
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#include "framelessquickwindow_p.h"
 #include <QtCore/qobject.h>
 #include <QtQuick/qquickwindow.h>
 #include <QtQuick/private/qquickanchors_p_p.h>
@@ -36,8 +37,6 @@ QT_END_NAMESPACE
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class FramelessQuickWindow;
-
 class FRAMELESSHELPER_QUICK_API FramelessQuickWindowPrivate : public QObject
 {
     Q_OBJECT

diff --git a/include/FramelessHelper/Quick/private/quickimageitem_p.h b/include/FramelessHelper/Quick/private/quickimageitem_p.h
@@ -25,14 +25,13 @@
 #pragma once
 
 #include "framelesshelperquick_global.h"
+#include "quickimageitem.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qvariant.h>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class QuickImageItem;
-
 class FRAMELESSHELPER_QUICK_API QuickImageItemPrivate : public QObject
 {
     Q_OBJECT

diff --git a/include/FramelessHelper/Quick/private/quickmicamaterial_p.h b/include/FramelessHelper/Quick/private/quickmicamaterial_p.h
@@ -25,12 +25,12 @@
 #pragma once
 
 #include "framelesshelperquick_global.h"
+#include "quickmicamaterial.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class QuickMicaMaterial;
 class WallpaperImageNode;
 
 class FRAMELESSHELPER_QUICK_API QuickMicaMaterialPrivate : public QObject

diff --git a/include/FramelessHelper/Quick/private/quickstandardtitlebar_p.h b/include/FramelessHelper/Quick/private/quickstandardtitlebar_p.h
@@ -27,6 +27,7 @@
 #include "framelesshelperquick_global.h"
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
 #include "quickchromepalette.h"
+#include "quickstandardsystembutton_p.h"
 #include <QtQuick/private/qquickrectangle_p.h>
 #include <QtQuickTemplates2/private/qquicklabel_p.h>
 
@@ -36,7 +37,6 @@ QT_END_NAMESPACE
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class QuickStandardSystemButton;
 class QuickImageItem;
 
 class FRAMELESSHELPER_QUICK_API QuickStandardTitleBar : public QQuickRectangle

diff --git a/include/FramelessHelper/Widgets/framelesswidgetshelper.h b/include/FramelessHelper/Widgets/framelesswidgetshelper.h
@@ -27,6 +27,7 @@
 #include "framelesshelperwidgets_global.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qloggingcategory.h>
+#include <QtWidgets/qwidget.h>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 

diff --git a/include/FramelessHelper/Widgets/private/framelessmainwindow_p.h b/include/FramelessHelper/Widgets/private/framelessmainwindow_p.h
@@ -25,12 +25,12 @@
 #pragma once
 
 #include "framelesshelperwidgets_global.h"
+#include "framelessmainwindow.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class FramelessMainWindow;
 class WidgetsSharedHelper;
 
 class FRAMELESSHELPER_WIDGETS_API FramelessMainWindowPrivate : public QObject

diff --git a/include/FramelessHelper/Widgets/private/framelesswidget_p.h b/include/FramelessHelper/Widgets/private/framelesswidget_p.h
@@ -25,12 +25,12 @@
 #pragma once
 
 #include "framelesshelperwidgets_global.h"
+#include "framelesswidget.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class FramelessWidget;
 class WidgetsSharedHelper;
 
 class FRAMELESSHELPER_WIDGETS_API FramelessWidgetPrivate : public QObject

diff --git a/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h b/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h
@@ -25,13 +25,13 @@
 #pragma once
 
 #include "framelesshelperwidgets_global.h"
+#include "framelesswidgetshelper.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
 struct WidgetsHelperData;
-class FramelessWidgetsHelper;
 
 class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelperPrivate : public QObject
 {

diff --git a/include/FramelessHelper/Widgets/private/standardsystembutton_p.h b/include/FramelessHelper/Widgets/private/standardsystembutton_p.h
@@ -24,9 +24,10 @@
 
 #pragma once
 
+#include "framelesshelperwidgets_global.h"
+#include "standardsystembutton.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
-#include "framelesshelperwidgets_global.h"
 
 QT_BEGIN_NAMESPACE
 class QEnterEvent;
@@ -35,8 +36,6 @@ QT_END_NAMESPACE
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class StandardSystemButton;
-
 class FRAMELESSHELPER_WIDGETS_API StandardSystemButtonPrivate : public QObject
 {
     Q_OBJECT

diff --git a/include/FramelessHelper/Widgets/private/standardtitlebar_p.h b/include/FramelessHelper/Widgets/private/standardtitlebar_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include "framelesshelperwidgets_global.h"
+#include "standardtitlebar.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 
@@ -34,7 +35,6 @@ QT_END_NAMESPACE
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-class StandardTitleBar;
 class StandardSystemButton;
 class ChromePalette;
 

diff --git a/include/FramelessHelper/Widgets/standardtitlebar.h b/include/FramelessHelper/Widgets/standardtitlebar.h
@@ -25,16 +25,16 @@
 #pragma once
 
 #include "framelesshelperwidgets_global.h"
-#include <QtCore/qloggingcategory.h>
+#include "standardsystembutton.h"
 #include <chromepalette.h>
+#include <QtCore/qloggingcategory.h>
 #include <QtWidgets/qwidget.h>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(lcStandardTitleBar)
 
 class StandardTitleBarPrivate;
-class StandardSystemButton;
 
 class FRAMELESSHELPER_WIDGETS_API StandardTitleBar : public QWidget
 {