Skip to content

build: find Qt and Sparkle the way Craft and Conan both provide them - #12694

Draft
oc-tmueller wants to merge 3 commits into
masterfrom
build/portable-qt-sparkle-lookup
Draft

oc-tmueller wants to merge 3 commits into
masterfrom
build/portable-qt-sparkle-lookup

Conversation

@oc-tmueller

Copy link
Copy Markdown
Contributor

Split out of #12689, which adds the Conan dependency configuration. These are the only changes there to the client's own build files; on their own they don't depend on Conan and must keep the Craft build green.

Conan's Qt and Sparkle packages expose different CMake names than Craft's. This switches to forms both provide:

  • find_package(Qt6 COMPONENTS LinguistTools) instead of the separate Qt6LinguistTools package.
  • Qt6::qmake read with LOCATION. Conan has no versionless Qt::qmake, and Qt's own target sets only IMPORTED_LOCATION_<CONFIG>.
  • <QtQmlIntegration/QtQmlIntegration> in accountstate.h and space.h, as account.h and accountmanager.h already include it. Conan puts only include/ on the path.
  • FindSparkle.cmake defines the sparkle::sparkle target that Conan's package provides, and the updater checks for and links that target instead of SPARKLE_FOUND/SPARKLE_LIBRARY. Before this, a Conan build silently left the Sparkle updater out.

#12689 depends on this PR and drops these commits once it merges.

🤖 Generated with Claude Code

oc-tmueller and others added 2 commits November 18, 2026 10:07
… way

Conan's Qt is one Qt6 package with components: it has no separate
Qt6LinguistTools config, no versionless Qt::qmake alias, and puts only
include/ (not include/QtQmlIntegration) on the path for the header-only
QmlIntegration module. Use the forms that both Conan's and Qt's own CMake
files provide:
- find_package(Qt6 COMPONENTS LinguistTools), as Qt documents it;
- Qt6::qmake, read with LOCATION: Qt's own exported target sets only
  IMPORTED_LOCATION_<CONFIG>, so IMPORTED_LOCATION would be NOTFOUND,
  while LOCATION resolves either form on an imported target;
- <QtQmlIntegration/...>, as account.h and accountmanager.h already do.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The Conan package's sparkle-config.cmake defines the target sparkle::sparkle and
Sparkle_FOUND, but not FindSparkle's SPARKLE_FOUND and SPARKLE_LIBRARY, so a
Conan build silently left out the Sparkle updater. FindSparkle now defines the
same target, and the updater checks for it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@update-docs

update-docs Bot commented Nov 18, 2026

Copy link
Copy Markdown

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant