fix: separate function def and impl to solve build conflicts

ZhongYic00 · Jun 10, 2022 · be336fa · be336fa
1 parent 8d5bc9f
commit be336fa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/include/qtquickdtk.cpp b/src/include/qtquickdtk.cpp
@@ -0,0 +1,14 @@
+#include "qtquickdtk.h"
+void importProperties(QQmlEngine* engine){
+    engine->rootContext()->setContextProperty("smallRadius",8);
+    engine->rootContext()->setContextProperty("bigRadius",18);
+
+    qWarning()<<"importProperties::registerType"<<qmlRegisterType<QMLDPalette>("QMLDPalette",1,0,"QMLDPalette");
+    qWarning()<<"importProperties::registerSingleton"<<qmlRegisterSingletonType(QUrl("qrc:/dtk/DPalette.qml"),"singleton.dpalette",1,0,"DPalette");
+}
+
+void enableQtQuickDTKStyle(QQmlEngine* engine){
+    QQuickStyle::addStylePath("qrc:/dtk");
+    importProperties(engine);
+    qWarning()<<"enableQtQuickDTKStyle:: styles"<<QQuickStyle::stylePathList()<<QQuickStyle::name();
+}
diff --git a/src/include/qtquickdtk.h b/src/include/qtquickdtk.h
@@ -12,15 +12,6 @@
 #include "qmldpalette.h"
 
 DWIDGET_USE_NAMESPACE
-void importProperties(QQmlEngine* engine){
-    engine->rootContext()->setContextProperty("smallRadius",8);
-    engine->rootContext()->setContextProperty("bigRadius",18);
-
-    qmlRegisterType<QMLDPalette>("QMLDPalette",1,0,"QMLDPalette");
-    qmlRegisterSingletonType(QUrl("qrc:/dtk/DPalette.qml"),"singleton.dpalette",1,0,"DPalette");
-}
-void enableQtQuickDTKStyle(QQmlEngine* engine){
-    QQuickStyle::addStylePath("qrc:/dtk");
-    importProperties(engine);
-}
+void importProperties(QQmlEngine* engine);
+void enableQtQuickDTKStyle(QQmlEngine* engine);
 #endif // QTQUICKDTK_H