Skip to content

sync: from linuxdeepin/dtkdeclarative #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 1 commit into from
Nov 17, 2025
Merged

sync: from linuxdeepin/dtkdeclarative #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
set(CHAMELEON_PATH "${PROJECT_BINARY_DIR}/plugins")
add_definitions(
-DCHAMELEON_PATH="${CHAMELEON_PATH}"
-DQT_DEPRECATED_WARNINGS
)
add_subdirectory(exhibition)
Expand Down
7 changes: 4 additions & 3 deletions examples/exhibition/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Copy link

@sourcery-ai sourcery-ai bot Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): String concatenation with chameleonPath may not behave as expected.

Use chameleonPath + "/Chameleon" for proper string concatenation in C++.

#else
QQuickStyle::setStyle("Chameleon");
#endif
Expand Down
7 changes: 4 additions & 3 deletions examples/qml-inspect/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Copy link

@sourcery-ai sourcery-ai bot Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): String concatenation with chameleonPath may not behave as expected.

Use chameleonPath + "/Chameleon" for proper string concatenation in C++.

#else
QQuickStyle::setStyle("Chameleon");
#endif
Expand Down
2 changes: 1 addition & 1 deletion qt6/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Loading