Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Workspace
Commits
9a4716e9
Commit
9a4716e9
authored
Jun 10, 2020
by
Nate Graham
Browse files
Fix compile failure
I should probably avoid committing merge failures.
parent
27c6a28f
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
9a4716e9
...
...
@@ -28,11 +28,7 @@ include(KDEClangFormat)
find_package
(
KF5
${
KF5_MIN_VERSION
}
REQUIRED COMPONENTS
Plasma DocTools Runner Notifications NotifyConfig Su NewStuff Wallet
IdleTime Declarative I18n KCMUtils TextWidgets KDELibs4Support Crash GlobalAccel
<<<<<<< HEAD
DBusAddons Wayland CoreAddons People ActivitiesStats Activities
)
=======
DBusAddons Wayland CoreAddons People ActivitiesStats KIO
)
>>>>>>> Plasma/5.19
DBusAddons Wayland CoreAddons People ActivitiesStats Activities KIO
)
find_package
(
KDED CONFIG REQUIRED
)
find_package
(
KF5NetworkManagerQt
${
KF5_MIN_VERSION
}
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment