sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative.

Source-pull-request: linuxdeepin/dtkdeclarative#549

Author: deepin-ci-robot

examples/CMakeLists.txt

@@ -1,6 +1,4 @@
-set(CHAMELEON_PATH "${PROJECT_BINARY_DIR}/plugins")
 add_definitions(
-    -DCHAMELEON_PATH="${CHAMELEON_PATH}"
     -DQT_DEPRECATED_WARNINGS
 )
 add_subdirectory(exhibition)

examples/exhibition/main.cpp

@@ -71,16 +71,17 @@ int main(int argc, char **argv)
 
     QQmlApplicationEngine engine;
 
-    engine.addImportPath(CHAMELEON_PATH);
+    const QString chameleonPath = QStringLiteral("%1/../../../plugins").arg(QGuiApplication::applicationDirPath());
+    engine.addImportPath(chameleonPath);
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QQuickStyle::addStylePath(CHAMELEON_PATH);
+    QQuickStyle::addStylePath(chameleonPath);
 //    QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
 #else
 //    QQuickWindow::setGraphicsApi(QSGRendererInterface::Software);
 #endif
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) && defined(QT_NO_DEBUG)
-    QQuickStyle::setStyle(CHAMELEON_PATH"/Chameleon");
+    QQuickStyle::setStyle(chameleonPath"/Chameleon");
 #else
     QQuickStyle::setStyle("Chameleon");
 #endif

examples/qml-inspect/main.cpp

@@ -20,16 +20,17 @@ int main(int argc, char *argv[])
 
     QQmlApplicationEngine engine;
 
-    engine.addImportPath(CHAMELEON_PATH);
+    const QString chameleonPath = QStringLiteral("%1/../../../plugins").arg(QGuiApplication::applicationDirPath());
+    engine.addImportPath(chameleonPath);
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QQuickStyle::addStylePath(CHAMELEON_PATH);
+    QQuickStyle::addStylePath(chameleonPath);
 //    QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
 #else
 //    QQuickWindow::setGraphicsApi(QSGRendererInterface::Software);
 #endif
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) && defined(QT_NO_DEBUG)
-    QQuickStyle::setStyle(CHAMELEON_PATH"/Chameleon");
+    QQuickStyle::setStyle(chameleonPath"/Chameleon");
 #else
     QQuickStyle::setStyle("Chameleon");
 #endif

qt6/src/CMakeLists.txt

@@ -87,4 +87,4 @@ install(EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeTargets NAMESPACE Dtk${DTK_VERS
 install(FILES ${QM_FILES} DESTINATION "${TRANSLATIONS_INSTALL_PATH}")
 # Install plugin
 install(TARGETS ${PLUGIN_NAME} DESTINATION "${QML_INSTALL_DIR}/${URI_PATH}")
-install(DIRECTORY "${PLUGIN_OUTPUT_DIR}/${URI_PATH}/" DESTINATION "${QML_INSTALL_DIR}/${URI_PATH}")
+install(FILES "${PLUGIN_OUTPUT_DIR}/${URI_PATH}/qmldir" DESTINATION "${QML_INSTALL_DIR}/${URI_PATH}")