From 44f7948df32e750a890a9375634eca39f033a5ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Fri, 12 Apr 2024 16:50:49 +0800 Subject: [PATCH] update --- example/src/singleton.h | 2 +- example/src/stdafx.h | 6 +++--- src/CMakeLists.txt | 6 +----- src/singleton.h | 2 +- src/stdafx.h | 6 +++--- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/example/src/singleton.h b/example/src/singleton.h index 466ce43c..9583c687 100644 --- a/example/src/singleton.h +++ b/example/src/singleton.h @@ -21,4 +21,4 @@ private: \ public: \ static Class* getInstance() { \ return Singleton::getInstance(); \ -} \ +} diff --git a/example/src/stdafx.h b/example/src/stdafx.h index b411a82a..f902bad0 100644 --- a/example/src/stdafx.h +++ b/example/src/stdafx.h @@ -14,7 +14,7 @@ Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) return _##M; \ } \ private: \ - TYPE _##M; \ + TYPE _##M; #define Q_PROPERTY_AUTO(TYPE, M) \ Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \ @@ -30,7 +30,7 @@ Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) return _##M; \ } \ private: \ - TYPE _##M; \ + TYPE _##M; #define Q_PROPERTY_READONLY_AUTO(TYPE, M) \ @@ -47,4 +47,4 @@ Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL) return _##M; \ } \ private: \ - TYPE _##M; \ + TYPE _##M; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0ed7b59a..70040b5e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -143,11 +143,7 @@ if (QT_VERSION VERSION_GREATER_EQUAL "6.2") RESOURCE_PREFIX "/qt/qml" ) else () - #加快qrc编译 - set(QRC_FILE Qt5/imports/fluentui.qrc) - qt_add_big_resources(QRC_RESOURCES ${QRC_FILE}) - list(APPEND QRC_RESOURCES ${QRC_FILE}) - set_property(SOURCE ${QRC_FILE} PROPERTY SKIP_AUTORCC ON) + qt_add_resources(QRC_RESOURCES Qt5/imports/fluentui.qrc) #如果是Qt6.2版本以下，则使用add_qmlplugin函数添加资源文件，这是个自定义的函数，详情见.cmake/QmlPlugin.cmake include(QmlPlugin) add_qmlplugin(${PROJECT_NAME} diff --git a/src/singleton.h b/src/singleton.h index 466ce43c..9583c687 100644 --- a/src/singleton.h +++ b/src/singleton.h @@ -21,4 +21,4 @@ private: \ public: \ static Class* getInstance() { \ return Singleton::getInstance(); \ -} \ +} diff --git a/src/stdafx.h b/src/stdafx.h index b411a82a..f902bad0 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -14,7 +14,7 @@ Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) return _##M; \ } \ private: \ - TYPE _##M; \ + TYPE _##M; #define Q_PROPERTY_AUTO(TYPE, M) \ Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \ @@ -30,7 +30,7 @@ Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) return _##M; \ } \ private: \ - TYPE _##M; \ + TYPE _##M; #define Q_PROPERTY_READONLY_AUTO(TYPE, M) \ @@ -47,4 +47,4 @@ Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL) return _##M; \ } \ private: \ - TYPE _##M; \ + TYPE _##M;