alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't link agains KConfigWidgets

Browse Source 
not needed anymore
This commit is contained in:
Marco Martin 2014-05-19 16:58:37 +02:00
parent d0816f1448
commit 924818a0ca
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -14,6 +14,7 @@ include(KDECMakeSettings)
include(KDECompilerSettings)
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(KDEFrameworkCompilerSettings)
set(KF5_VERSION "4.99.0") # handled by release scripts
set(KF5_DEP_VERSION "4.99.0") # handled by release scripts

2
src/plasma/CMakeLists.txt
View File

@ -109,9 +109,9 @@ endif()
target_link_libraries(KF5Plasma
PUBLIC
KF5::ConfigWidgets # KConfigSkeleton
KF5::Service # For kplugininfo.h and kservice.h
PRIVATE
Qt5::Gui
Qt5::Sql
Qt5::Quick # needed in service.cpp, remove?
Qt5::Svg

2
src/plasma/plasma.h
View File

@ -22,7 +22,7 @@
/** @header plasma/plasma.h <Plasma/Plasma> */
#include <QPainterPath>
#include <QObject>
#include <plasma/plasma_export.h>

2
src/plasma/theme.cpp
View File

@ -464,7 +464,7 @@ KPluginInfo Theme::pluginInfo() const
QFont Theme::defaultFont() const
{
return QApplication::font();
return QGuiApplication::font();
}
QFont Theme::smallestFont() const

4
src/plasma/theme.h
View File

@ -21,7 +21,7 @@
#ifndef PLASMA_THEME_H
#define PLASMA_THEME_H
#include <QApplication>
#include <QGuiApplication>
#include <QFont>
#include <QtCore/QObject>
@ -485,7 +485,7 @@ public:
* @return The size of the letter "M" as rendered on the screen with the given font.
* @since 5.0
*/
Q_INVOKABLE QSizeF mSize(const QFont &font = QApplication::font()) const;
Q_INVOKABLE QSizeF mSize(const QFont &font = QGuiApplication::font()) const;
QString backgroundPath(const QString &image) const;

4
tests/dpi/dpitest.h
View File

@ -21,7 +21,7 @@
#define PLUGINTEST_H
#include <QCoreApplication>
#include <QApplication>
#include <QGuiApplication>
class QCommandLineParser;
@ -30,7 +30,7 @@ namespace Plasma
class DPITestPrivate;
class DPITest : public QApplication
class DPITest : public QGuiApplication
{
Q_OBJECT

4
tests/kplugins/plugintest.h
View File

@ -21,7 +21,7 @@
#define PLUGINTEST_H
#include <QCoreApplication>
#include <QApplication>
#include <QtGui/QGuiApplication>
#include <Plasma/DataEngine>
@ -32,7 +32,7 @@ namespace Plasma
class PluginTestPrivate;
class PluginTest : public QApplication
class PluginTest : public QGuiApplication
{
Q_OBJECT