This commit is contained in:
parent
69738fc1da
commit
3b192bb146
@ -1,58 +0,0 @@
|
||||
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
|
||||
Date: Sun, 20 Mar 2016 11:48:01 +0000
|
||||
Subject: Unbreak startup, add dependencies, drop Phonon
|
||||
X-Git-Tag: v16.03.80
|
||||
X-Git-Url: http://quickgit.kde.org/?p=kblocks.git&a=commitdiff&h=52f42548becb9396a45a795984b3f238326dd1bd
|
||||
---
|
||||
Unbreak startup, add dependencies, drop Phonon
|
||||
|
||||
BUG: 357408
|
||||
REVIEW: 127433
|
||||
---
|
||||
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -9,9 +9,14 @@
|
||||
|
||||
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg Network)
|
||||
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
|
||||
+ Config
|
||||
+ ConfigWidgets
|
||||
+ CoreAddons
|
||||
Crash
|
||||
DocTools
|
||||
+ DBusAddons
|
||||
I18n
|
||||
+ WidgetsAddons
|
||||
XmlGui
|
||||
)
|
||||
|
||||
@@ -93,6 +93,7 @@
|
||||
Phonon::phonon4qt5
|
||||
Qt5::Network
|
||||
KF5::Crash
|
||||
+ KF5::DBusAddons
|
||||
KF5::XmlGui
|
||||
KF5::I18n
|
||||
Qt5::Svg
|
||||
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <KAboutData>
|
||||
#include <KCrash>
|
||||
+#include <KDBusService>
|
||||
#include <KLocalizedString>
|
||||
|
||||
#include <QString>
|
||||
@@ -334,6 +335,7 @@
|
||||
aboutData.setupCommandLine(&parser);
|
||||
parser.process(app);
|
||||
aboutData.processCommandLine(&parser);
|
||||
+ KDBusService service;
|
||||
|
||||
app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kblocks")));
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user