Commit Graph

61 Commits

Author SHA1 Message Date
Aleix Pol
2cb4ebd6f5 Code cleanup
Remove unused includes
Remove void code logic (KCMUTILS_LIBS was always empty anyway)
2013-11-15 16:56:17 +01:00
Aleix Pol
0fa21b4af5 Iterate over the cmake scripts
Prefer using imported targets rather than cmake variables.
2013-11-15 16:46:59 +01:00
Aleix Pol
3ef13c53dc Remove predicates on cmake end commands
http://techbase.kde.org/Policies/CMake_Coding_Style#End_commands
2013-11-14 17:25:10 +01:00
Aleix Pol
392fa639b6 Only include QCA includes where needed
There's no need to make all the framework look for the QCA includes while
they're only being used by the remote part. It could possibly be made more
specific, but I don't think those are yet being used anyway.
2013-11-11 18:29:32 +01:00
Kevin Ottens
8507084d62 Use the target now that KDE4Support exports one 2013-10-28 12:56:13 +01:00
Kevin Ottens
c61c65d8e7 Make it link 2013-10-22 21:56:11 +02:00
Kevin Ottens
ce00ca976e KDE4Attic is gone 2013-10-22 18:02:39 +02:00
Sebastian Kügler
d5bef21f7b Rename target plasma to Plasma
This is in line with the frameworks naming policy, camelcasing. Up until
now, libplasma was the only library being KF5::plasma, that is now
KF5::Plasma.
2013-10-16 00:47:47 +02:00
Sebastian Kügler
cd5ee90d0e Clean up libplasma cmake 2013-10-16 00:28:02 +02:00
Sebastian Kügler
c7c9e8fefc Put steve's changes back in
CCMAIL:steveire@gmail.com
2013-10-13 02:00:32 +02:00
Sebastian Kügler
c2be5b6b12 Revert bef789642e
That commit breaks the build, not finding qtest_kde.h, and cascading
errors from there.

CCMAIL:steveire@gmail.com
2013-10-12 21:47:07 +02:00
Stephen Kelly
53f12ccdde Add the dir for the plasma_export.h file. 2013-10-12 15:55:19 +02:00
Stephen Kelly
383660433c Try to fix the plasma include dirs failure on bko.
I can't reproduce it.
2013-10-12 15:49:47 +02:00
Stephen Kelly
bef789642e Remove obsolete include_directories use. 2013-10-12 15:25:19 +02:00
Aleix Pol
a3c7a9690f Make the runners API compile again
Recently there's been some big changes in the ThreadWeaver API.
So big that they break the source compatibility we were supposed to
maintain, big time.

This patch tries to port plasma-framework to that new API.

REVIEW: 113179
2013-10-10 20:28:46 +02:00
Stephen Kelly
badeec199d Add the include/KDE dir to the needed incude directories. 2013-10-10 13:03:14 +02:00
Sebastian Kügler
bf03242380 Disable krunner-related code from the build 2013-10-08 17:37:15 +02:00
Sebastian Kügler
36dfe61309 Disable krunner-related classes from libplasma
They will be rethought, but would be blocking a threadweaver merge right
now

CCMAIL:me@vhanda.in
2013-10-08 13:47:16 +02:00
Ben Cooksley
1757ef8899 Reverse accidental change 2013-10-07 23:49:28 +13:00
Ben Cooksley
d2115ae938 Set an include path with the KF5::plasma target.
REVIEW: 113139
2013-10-07 23:48:05 +13:00
Sebastian Kügler
2ca0e0eff2 find KDELibs4 2013-10-05 04:30:19 +02:00
Sebastian Kügler
0aa6247dd9 Use target instead of var for KF5::KI18n 2013-10-04 23:44:36 +02:00
Sebastian Kügler
80a4e61a4e Use target instead of var for KF5::Solid 2013-10-04 23:40:30 +02:00
Sebastian Kügler
b2121c1e06 cmake fixes
- finally remove KDE4_KIO_LIBS
- change KDeclarative to KF5::KDeclarative
- add KService where needed
2013-10-04 19:18:34 +02:00
Aleix Pol
1891066fc2 Adapt to kdelibs ab56e2f. 2013-10-04 18:40:47 +02:00
Stephen Kelly
0e8f31644b Add some missing links.
The
2013-10-01 14:12:29 +02:00
Eike Hein
7f10a19acd Fix build. 2013-09-25 09:36:33 +02:00
Wojciech Kapuscinski
ea835ccdb1 remove all links to kdeqt5staging
QCommandLineParser is now in qt5

REVIEW: 112558
2013-09-10 10:13:05 +02:00
Sebastian Kügler
9b1b090159 Install header for dataengineconsumer 2013-08-28 03:52:14 +02:00
Martin Gräßlin
531e6c3db5 Fix linking
KDEUI is dead which caused quite some collateral damage in our
CMakeLists.
2013-08-20 07:47:09 +02:00
Sebastian Kügler
fd3f1eaa35 Reduce KDE4 usage in cmake setup 2013-08-09 05:22:20 +02:00
Sebastian Kügler
f034b84daf add ctor back in that got lost during the merge 2013-07-30 21:31:12 +02:00
Sebastian Kügler
839c271535 Merge branch 'master' into sebas/kplugins 2013-07-30 01:09:40 +02:00
Sebastian Kügler
8da8375802 brutally add KDE4Attic 2013-07-29 11:50:47 +02:00
Sebastian Kügler
66a0a5d4e7 Clean up some KDE4-specific calls 2013-07-29 00:39:32 +02:00
Sebastian Kügler
d3b9cf5f35 merge 2013-07-25 14:45:49 +02:00
Kevin Ottens
c42406cabc Pull in the KDE4Attic dependency 2013-07-25 11:54:15 +02:00
Sebastian Kügler
668a1bc05e Merge branch 'master' into sebas/kplugins 2013-07-16 17:49:21 +02:00
Benjamin Port
ec8cb5662b Remove include dirs for ki18n not needed anymore with Target 2013-07-16 11:05:03 +02:00
Benjamin Port
a730d47c3c fix build (ki18n rename) 2013-07-15 16:01:59 +02:00
Sebastian Kügler
84cd704368 Merge branch 'master' into sebas/kplugins 2013-07-12 10:35:09 +02:00
Alex Neundorf
454bf83be3 -adapt to current changes in kdelibs regarding kde4support: use ${KDE4Support_LIBRARIES} when using it
Search for KDE4Support, but after searching KDELibs4, this is hackish, but currentlx necessary due to
cyclic dependencies we still have

Alex
2013-07-11 22:57:04 +02:00
Sebastian Kügler
dc94c2c83b Add pluginstest to build 2013-06-24 15:24:33 +02:00
Andrea Scarpino
0ea93fd3d3 MacroLogFeature has been removed. See ECM_SouceIncompatChanges
REVIEW:111074
2013-06-17 21:43:59 +02:00
Sebastian Kügler
22d261759b Fix up library finding
* Generate and install and include PlasmaTargets.cmake file
* set Plasma_LIBRARIES to KF5::plasma

-> kde-workspace build works for me.
2013-06-13 16:01:06 +02:00
Kevin Ottens
9d93cb7ccc Those files are gone, don't try to install them 2013-05-22 11:06:21 +02:00
Aaron Seigo
001d88a0a4 bump the v# 2013-05-07 12:32:05 +02:00
Sebastian Kügler
a8ac6ab694 Add Plasma/Generic servicetype
This irons out an asymmetry: Plasma/Generic was never read from
KService, as the service type wasn't registered, we just looked it up in
the right directory.

This patch allows us to use KService to list packages, the
installPackage cmake macro installs the service files for us already.
Apps that look up the package in the "right path" still work.
2013-05-02 23:54:11 +02:00
Sebastian Kügler
77f8d35ea9 Install wallpaper, shell and lookandfeel servicetypes 2013-04-25 03:23:53 +02:00
Sebastian Kügler
78b6fa2c81 service's associatedItem is a QQuickItem now 2013-04-03 00:10:04 +02:00