Depends on D23157
Details
Details
- Reviewers
broulik ngraham - Commits
- R102:42fe072ad0fe: [energy KCM] Add battery Technology
Compiles
Tested with KF5 5.62 installed
Diff Detail
Diff Detail
- Repository
- R102 KInfoCenter
- Branch
- arcpatch-D23392
- Lint
No Linters Available - Unit
No Unit Test Coverage - Build Status
Buildable 15976 Build 15994: arc lint + arc unit
Comment Actions
Needs a rebase as it no longer applies cleanly:
$ arc patch D23392 INFO Base commit is not in local repository; trying to fetch. Created and checked out branch arcpatch-D23392. Branch name arcpatch-D23152 already exists; trying a new name. Created and checked out branch arcpatch-D23152_1. Checking patch Modules/energy/package/contents/ui/main.qml... Checking patch Modules/energy/batterymodel.h... Checking patch Modules/energy/batterymodel.cpp... Applied patch Modules/energy/package/contents/ui/main.qml cleanly. Applied patch Modules/energy/batterymodel.h cleanly. Applied patch Modules/energy/batterymodel.cpp cleanly. Cherry Pick Failed! Exception Command failed with error #1! COMMAND git cherry-pick 'arcpatch-D23152_1' STDOUT (empty) STDERR error: could not apply 84aed6f... [energy kcm] Display Vendor and model hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' (Run with `--trace` for a full exception trace.)
Comment Actions
Please note that the feature needs solid 5.62 installed on system as qml looks in /usr/include/solid/battery.h for the battery model header.
By chance iIf you know how to set the include path used by qml....
Comment Actions
Probably easiest to just wait until 5.62 is tagged in a few days and then commit. This is safe because KInfoCenter is distributed with Plasma, and the next Plasma release (5.17) will have Frameworks 5.62 as the dependency version. I've got a few patches myself that are waiting on 5.62 tagging.