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

Crudely make corebindings kde4support free

Browse Source
This commit is contained in:
Sebastian Kügler 2013-10-05 01:38:31 +02:00
parent 7ee3a698b0
commit 3c81603a8b
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/declarativeimports/core/CMakeLists.txt
View File

@ -44,7 +44,6 @@ target_link_libraries(corebindingsplugin
${Qt5Qml_LIBRARIES}
${KDeclarative_LIBRARIES}
${KCore_LIBRARIES}
${KDE4Support_LIBRARIES}
KF5::KIconThemes
KF5::KWindowSystem
plasma)
@ -68,4 +67,4 @@ endif(X11_FOUND)
install(TARGETS corebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
install(FILES qmldir ToolTip.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
add_subdirectory(tests)
#add_subdirectory(tests)

2
src/declarativeimports/core/dialog.cpp
View File

@ -31,7 +31,7 @@
#include <QLayout>
#include <QScreen>
#include <KWindowSystem>
#include <kwindowsystem.h>
#include <kwindoweffects.h>
#include <Plasma/Plasma>
#include <Plasma/Corona>

4
src/declarativeimports/core/iconitem.cpp
View File

@ -24,8 +24,8 @@
#include <QPainter>
#include <QPropertyAnimation>
#include <KIconLoader>
#include <KIconEffect>
#include <kiconloader.h>
#include <kiconeffect.h>
#include <plasma/svg.h>

1
src/declarativeimports/core/tests/CMakeLists.txt
View File

@ -15,7 +15,6 @@ qt4_automoc(sortfiltermodeltest.cpp)
target_link_libraries(sortfiltermodeltest
plasma
${KDE4Support_LIBRARIES}
${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY}
KF5::KI18n

10
src/declarativeimports/core/theme.cpp
View File

@ -22,8 +22,8 @@
#include <QQmlPropertyMap>
#include <QFontMetrics>
#include <KGlobalSettings>
#include <KIconLoader>
#include <QFontDatabase>
#include <kiconloader.h>
#include <QApplication>
@ -46,8 +46,8 @@ ThemeProxy::ThemeProxy(QQmlEngine *parent)
connect(this, &Plasma::Theme::themeChanged, this, &ThemeProxy::themeChanged);
connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(iconLoaderSettingsChanged()));
connect(KGlobalSettings::self(), &KGlobalSettings::kdisplayFontChanged, this, &ThemeProxy::defaultFontChanged);
connect(KGlobalSettings::self(), &KGlobalSettings::kdisplayFontChanged, this, &ThemeProxy::smallestFontChanged);
//connect(KGlobalSettings::self(), &KGlobalSettings::kdisplayFontChanged, this, &ThemeProxy::defaultFontChanged);
//connect(KGlobalSettings::self(), &KGlobalSettings::kdisplayFontChanged, this, &ThemeProxy::smallestFontChanged);
}
ThemeProxy::~ThemeProxy()
@ -66,7 +66,7 @@ QFont ThemeProxy::defaultFont() const
QFont ThemeProxy::smallestFont() const
{
return KGlobalSettings::smallestReadableFont();
return QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont);
}
QSizeF ThemeProxy::mSize(const QFont &font) const

2
src/declarativeimports/core/windowthumbnail.cpp
View File

@ -18,7 +18,7 @@
*/
#include "windowthumbnail.h"
// KF5
#include <KWindowSystem>
#include <kwindowsystem.h>
// Qt
#include <QGuiApplication>
#include <QIcon>