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

find KDELibs4

Browse Source
This commit is contained in:
Sebastian Kügler 2013-10-05 04:30:19 +02:00
parent dad1466757
commit 2ca0e0eff2
8 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
project(qtextracomponents) project(qtextracomponents)
add_subdirectory(tests) #add_subdirectory(tests)
set(qtextracomponents_SRCS set(qtextracomponents_SRCS
qtextracomponentsplugin.cpp qtextracomponentsplugin.cpp
@ -14,7 +14,6 @@ set(qtextracomponents_SRCS
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
) )
add_library(qtextracomponentsplugin SHARED ${qtextracomponents_SRCS}) add_library(qtextracomponentsplugin SHARED ${qtextracomponents_SRCS})

4
src/declarativeimports/qtextracomponents/qiconitem.cpp
View File

@ -19,8 +19,8 @@
#include "qiconitem.h" #include "qiconitem.h"
#include <KIconLoader> #include <kiconloader.h>
#include <KIconEffect> #include <kiconeffect.h>
#include <QIcon> #include <QIcon>
#include <QPainter> #include <QPainter>

3
src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
View File

@ -8,8 +8,7 @@ target_link_libraries(fullmodelaccesstest
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${KCore_LIBRARIES} ${KCore_LIBRARIES}
${KDE4Support_LIBRARIES} #${KDE4Support_LIBRARIES}
KF5::KI18n KF5::KI18n
) )

4
src/plasma/CMakeLists.txt
View File

@ -155,7 +155,7 @@ target_link_libraries(plasma
KF5::KDE4Attic KF5::KDE4Attic
Qt5::UiTools Qt5::UiTools
${KDE4Attic_LIBRARIES} ${KDE4Attic_LIBRARIES}
${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal #${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal
) )
#FIXME gpgme++ is in kdepimlibs, needs to be elsewhere #FIXME gpgme++ is in kdepimlibs, needs to be elsewhere
target_link_libraries(plasma KF5::KDeclarative KF5::KArchive) target_link_libraries(plasma KF5::KDeclarative KF5::KArchive)
@ -168,7 +168,7 @@ if(DL_LIBRARY)
target_link_libraries(plasma ${DL_LIBRARY}) target_link_libraries(plasma ${DL_LIBRARY})
endif(DL_LIBRARY) endif(DL_LIBRARY)
target_link_libraries(plasma LINK_INTERFACE_LIBRARIES ${KCore_LIBRARIES} Qt5::Widgets) target_link_libraries(plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets)
#do NOT use GENERIC versioning -- the plasma team will take care of versioning #do NOT use GENERIC versioning -- the plasma team will take care of versioning
set_target_properties(plasma PROPERTIES set_target_properties(plasma PROPERTIES

8
src/plasma/private/theme_p.cpp
View File

@ -539,11 +539,11 @@ void ThemePrivate::setThemeName(const QString &tempThemeName, bool writeSettings
if (colorsFile.isEmpty()) { if (colorsFile.isEmpty()) {
colors = 0; colors = 0;
QObject::connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), // QObject::connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
this, SLOT(colorsChanged()), Qt::UniqueConnection); // this, SLOT(colorsChanged()), Qt::UniqueConnection);
} else { } else {
QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), // QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
this, SLOT(colorsChanged())); // this, SLOT(colorsChanged()));
colors = KSharedConfig::openConfig(colorsFile); colors = KSharedConfig::openConfig(colorsFile);
} }

8
src/plasma/svg.cpp
View File

@ -547,11 +547,11 @@ void SvgPrivate::checkColorHints()
// check to see if we are using colors, but the theme isn't being used or isn't providing // check to see if we are using colors, but the theme isn't being used or isn't providing
// a colorscheme // a colorscheme
if (usesColors && (!themed || !actualTheme()->colorScheme())) { if (usesColors && (!themed || !actualTheme()->colorScheme())) {
QObject::connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), // QObject::connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
q, SLOT(colorsChanged()), Qt::UniqueConnection); // q, SLOT(colorsChanged()), Qt::UniqueConnection);
} else { } else {
QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), // QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
q, SLOT(colorsChanged())); // q, SLOT(colorsChanged()));
} }
} }

2
src/plasma/tests/kplugins/main.cpp
View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include <KLocalizedString> #include <klocalizedstring.h>
#include <qcommandlineparser.h> #include <qcommandlineparser.h>
#include <qcommandlineoption.h> #include <qcommandlineoption.h>

4
src/plasma/tests/kplugins/plugintest.cpp
View File

@ -25,7 +25,7 @@
#include <kservice.h> #include <kservice.h>
#include <kservicetypetrader.h> #include <kservicetypetrader.h>
#include <kshell.h> #include <kshell.h>
#include <KSycoca> #include <ksycoca.h>
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <plasma/applet.h> #include <plasma/applet.h>
@ -33,7 +33,7 @@
#include <plasma/package.h> #include <plasma/package.h>
#include <plasma/pluginloader.h> #include <plasma/pluginloader.h>
#include <plasma/dataengine.h> #include <plasma/dataengine.h>
#include <KGlobal> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kjob.h> #include <kjob.h>