Only include QtQuick support in Breeze KStyle if QtQuick is available

Authored by ntninja on May 5 2018, 4:00 PM.



Currently Breeze hard-depends on QtQuick in order to provide QtQuick-specific theme tweaks, but only for KDE5. This patch decouples KDE4 support from QtQuick support and allows Breeze to be built even when QtQuick is not available (at the loss of the QtQuick specific tweaks of course).

Diff Detail

Lint Skipped
Unit Tests Skipped
ntninja created this revision.May 5 2018, 4:00 PM
Restricted Application added a project: Plasma. · View Herald TranscriptMay 5 2018, 4:00 PM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
ntninja requested review of this revision.May 5 2018, 4:00 PM
mart accepted this revision.May 11 2018, 9:38 AM
This revision is now accepted and ready to land.May 11 2018, 9:38 AM

Do you have commit access?

Thanks for accepting this! Please also add it to the code repository!

I can commit this for you if you can provide your real name and a preferred email address. Thanks!

That would be „Alexander Schlarb <>“. Thanks!

I'm raid this patch no longer applies cleanly on master:

Created and checked out branch arcpatch-D12708.
Checking patch kstyle/config-breeze.h.cmake...
Checking patch kstyle/breezewindowmanager.h...
Checking patch kstyle/breezewindowmanager.cpp...
Checking patch kstyle/breezestyle.cpp...
Hunk #1 succeeded at 7158 (offset 74 lines).
Checking patch kstyle/CMakeLists.txt...
Hunk #1 succeeded at 25 (offset -15 lines).
Hunk #2 succeeded at 33 (offset -15 lines).
Hunk #3 succeeded at 41 (offset -15 lines).
error: while searching for:

  kconfig_add_kcfg_files(breeze_PART_SRCS breezestyleconfigdata.kcfgc)
  add_library(breeze MODULE ${breeze_PART_SRCS})
  target_link_libraries(breeze Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus Qt5::Quick)
  target_link_libraries(breeze KF5::ConfigCore KF5::ConfigWidgets KF5::GuiAddons KF5::WindowSystem)

  if( KF5FrameworkIntegration_FOUND )

error: patch failed: kstyle/CMakeLists.txt:166
Applied patch kstyle/config-breeze.h.cmake cleanly.
Applied patch kstyle/breezewindowmanager.h cleanly.
Applied patch kstyle/breezewindowmanager.cpp cleanly.
Applied patch kstyle/breezestyle.cpp cleanly.
Applying patch kstyle/CMakeLists.txt with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.

 Patch Failed! 
Usage Exception: Unable to apply patch!

Can you re-base it on master? (git pull --rebase origin/master). Thanks!

ntninja updated this revision to Diff 38838.Jul 31 2018, 1:03 PM

@ngraham: I've updated the patch to the latest GIT master of breeze. A quick test compile without qtdeclarative5-dev suggests that it still works.


ngraham closed this revision.Jul 31 2018, 1:06 PM