Commit Graph

206 Commits

Author SHA1 Message Date
Aurélien Gâteau
6a7ebaf293 Do not rely on KF5Umbrella
Should fix Jenkins
2014-02-12 15:03:29 +01:00
David Faure
515f9a352f fix compilation after 18473c9e9e which changed version.h to include plasma_version.h 2014-02-11 21:19:47 +01:00
Marco Martin
0573a47e06 tests and autotests in top level dir 2014-02-10 15:17:07 +01:00
David Faure
e76d11be9d Port to updated KActivities 2014-02-08 18:48:40 +01:00
David Faure
f9e5cc949f Update version numbers
Reorder some things to make it closer to the framework template, i.e.
easier to compare things with other frameworks.
2014-02-08 12:30:02 +01:00
Martin Gräßlin
bdc2ad2a84 Add outputOnly property to PlasmaCore.Dialog
The outputOnly property allows to specify that the dialog should not
accept any input. Thus it's an output only window which supports click
through. This is obviously platform specific and so far it is only
implemented for the X11 platform using the shape extension.

The input shape needs to be set once the window is visible and thus
the functionality is bound to the visible changed signal. The code
ensures that the required shape extension version is present and only
fetches it once.

REVIEW: 115139
2014-01-20 15:57:44 +01:00
Marco Martin
7bdee8dbd7 attica is not used anymore 2014-01-17 19:16:00 +01:00
Aurélien Gâteau
e7e2eeddc0 Plasma::Svg: Replace use of KSharedPtr with QWeakPointer and QSharedPointer
This removes the last dependency from plasma-framework on kde4support.

This change is a bit more involved than other kde4support removals because
QSharedPointer does not provide a count() method. I therefore reworked the code
to store the SharedSvgRenderer as a QWeakPointer in s_renderers, making it
possible to detect when the last one goes away by creating a QWeakPointer guard
in SvgPrivate::eraseRenderer().

REVIEW: 114912
2014-01-09 10:13:57 +01:00
Aurélien Gâteau
9fcb20fcd1 Make sure we find the Qt5-based version of KActivities 2014-01-08 13:18:19 +01:00
Alex Merry
0f1bc5e748 Add include(GenerateExportHeader) to CMakeLists.txt
We should not depend on the fact that KDECompilerSettings.cmake happens
to include it when we use generate_export_header().
2014-01-07 19:36:06 +00:00
Christophe Giboudeaux
26948d0cea Fix includes 2013-12-19 15:23:02 +01:00
Aleix Pol
1e9322500f Define DNSSD as a dependency 2013-12-18 18:30:54 +01:00
Aurélien Gâteau
02d6b37976 Renames for the KF5 prefix 2013-12-11 21:40:54 +01:00
Aurélien Gâteau
175204c453 KF5 prefix fixes 2013-12-11 21:40:54 +01:00
Aurélien Gâteau
0187f2b125 Do not list KConfigWidgets twice 2013-12-11 00:09:54 +01:00
Martin Gräßlin
718251466a Needs KGlobalAccel 2013-12-10 08:25:23 +01:00
Andrea Scarpino
9a3f028599 This is not needed; also QQmlAbstractUrlInterceptor is public again https://codereview.qt-project.org/#change,73153 2013-12-04 12:36:30 +01:00
Andrea Scarpino
2495df8b01 Allow builds with Qt 5.2
REVIEW:114239
2013-12-02 12:27:34 +01:00
Martin Gräßlin
b80cf620cf Use find_package for KActivities instead of having it in KF5 section
This is how kde-workspace is finding KActivities and it got tested to
fix the build problems on build.kde.org.
2013-11-26 08:14:43 +01:00
Aleix Pol
6b8544f9a6 KParts is a Kross dependency now 2013-11-22 13:12:49 +01:00
Aleix Pol
f187db1e86 Remove KDE4Support dependency from plasma-frameworks (almost)
Stop using classes from kde4support:
- KComponentData is deprecated, it will be using QCoreApplication::
applicationName() and QCoreApplication::applicationVersion(). Of course,
this means that the existing shells will have to be ported. I have no
problem with doing that port myself, if I'm told where to look into.
- Drop usage of KLocale, ported to QLocale
- Drop usage of KStandardDirs, ported to QStandardPaths
- Drop usage of KIcon, ported to QIcon

Furthermore, there's a module in src/declarativeimports/locale that IIUC
exposes KLocale bindings to QML. A specific plan to port it should happen
as well.

REVIEW: 113920
2013-11-22 13:03:29 +01:00
Aleix Pol
ed3e004a0d Fix build on jenkins
Don't look for QCA, it hasn't been ported to Qt5 yet, apparently
No need to use Transitional packages anymore
2013-11-11 18:40:19 +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
Aleix Pol
1d3da96d88 Make sure that plasma-framework is not using anything from kdelibs4
Stop finding the packages
Remove KDE4_ includes
Remove unused LIBINTL finder, provided by kdelibs
2013-11-11 18:29:32 +01:00
David Faure
b892f68e3e Fix compilation 2013-11-03 00:28:30 +01:00
David Faure
cb9013dc93 kde4support now needs kparts (I sure hope one day we won't have to do this by hand)
But this now fails looking for kactivities (which isn't in kdelibs.git?)
2013-11-03 00:15:20 +01:00
Stephen Kelly
3fde4633e6 Find the new KF5Config file, not the old FindKF5 file. 2013-11-01 12:59:27 +01:00
Hrvoje Senjan
365539cf93 Fix clean build
REVIEW: 113514
2013-10-31 11:51:58 +01:00
Stephen Kelly
8f1a1b83c9 Find ECM files from ECM. 2013-10-31 09:31:56 +01:00
Marco Martin
daa747d0a6 require kactivities 2013-10-23 15:45:54 +02:00
Kevin Ottens
ce00ca976e KDE4Attic is gone 2013-10-22 18:02:39 +02:00
Aleix Pol
af8a7bad7d Stop using Qt5Transitional in Plasma Frameworks
Removes the find_package(Qt5Transitional) and does the proper
find_package(Qt5) with the list of modules.

Most of the porting is about using the Qt5:: targets.

REVIEW: 113345
2013-10-22 00:40:17 +02:00
Martin Klapetek
4b6a02b20e The REQUIRED for XCB should be at different line
Since there's a "set_package_properties", which sets "TYPE RECOMMENDED",
the "REQUIRED" should be put here instead.
2013-10-21 15:52:48 +02:00
Martin Klapetek
8ceb7d5fa2 Make XCB required, not just recommended
Because it is, well, required.

Reviewed-by: Sebastian Kügler
2013-10-21 15:38:01 +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
bef789642e Remove obsolete include_directories use. 2013-10-12 15:25:19 +02:00
Kevin Ottens
449aebd314 Find Kross and not KIO 2013-10-07 17:01:12 +02:00
David Faure
0a0f0114ec Seems that order matters; kio depends on kbookmarks now rather than the other way around. 2013-10-05 12:38:09 +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
f49bef8df4 Move the use of Qt5Transitional. 2013-10-01 14:12:41 +02:00
Stephen Kelly
7b5066bdba Fix the use of ecm_setup_version. 2013-10-01 14:12:29 +02:00
Marco Martin
a7e9b1261b just use c++0x for now
gcc 4.6 and msvc still don't have -std=c++11
2013-09-11 11:15:29 +02:00
Martin Gräßlin
91d306d2e8 QQuick item for live updating window thumbnails
New qquick item in PlasmaCore to render a live updating window
thumbnail. The implementation uses XCB to redirect the specified
window using the composite extension. This means a running compositor
is not required. Through the damage extension the item tracks changes
to the window and triggers updates of the texture. Furthermore the
item tracks geometry changes of the window to recreate the window
pixmap.

If the pixmap of the window is valid, a texture is generated from it
using the glx texture from pixmap extension. For this a new optional
dependency for glx is added. On platform where glx is not available
(e.g. Windows, Linux with OpenGL ES) this will not get compiled and
the window's icon is used instead as a fallback.

REVIEW: 112142
2013-09-11 09:45:47 +02:00
Marco Martin
6f8c32fad7 Revert "add kdeqt5staging dependency"
This reverts commit 6c27cc0963.
2013-09-10 13:23:57 +02:00
Marco Martin
6c27cc0963 add kdeqt5staging dependency 2013-09-10 12:04:26 +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
Martin Gräßlin
97ce3dc808 Rework finding of XCB
Uses the new components syntax of FindXCB. So far plasma frameworks
only need the XCB component and that one is optional just like XLib.

The find xcb is moved to the toplevel CMakeLists.txt together with
the find x11 and HAVE_X11 gets set only if both X11 and XCB are found.

REVIEW: 112499
2013-09-09 06:14:35 +02:00
David Edmundson
dac6f34963 Add KBookmarks to list of needed modules to fix build 2013-09-05 19:09:18 +01:00
Marco Martin
8f74e67f9d old test applets live now in examples 2013-09-04 11:57:46 +02:00
Marco Martin
9a9ac9f9e5 containment actions config ui fully working 2013-08-26 21:22:06 +02:00
Kevin Ottens
4058e1da66 Make it build
KI18n and KGuiAddons have to come before KConfigWidgets
2013-08-20 10:56:02 +02:00
Kevin Ottens
037277da3c KWidgets is gone 2013-08-06 18:59:47 +02:00
Sebastian Kügler
186fa2c181 Merge branch 'master' into sebas/kplugins 2013-07-28 13:28:57 +02:00
David Faure
07f7fa328c Nothing seems to use libdbusmenu-qt in this module. 2013-07-26 18:01:10 +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
Kevin Ottens
39cd64fc68 Revert "Revert "Enabling C++11 flags for clang and gcc""
This reverts commit 597397b41f.

Reverting my own revert now that we have proper consensus on what one
can use of C++11 in KF5. For reference:
http://community.kde.org/Frameworks/Policies#Frameworks_compiler_requirements_and_C.2B.2B11

We probably want that properly done within CMake or E-C-M though.

CCMAIL: plasma-devel@kde.org
CCMAIL: kde-frameworks-devel@kde.org
2013-07-23 10:33:46 +02:00
Sebastian Kügler
06925637a7 Merge branch 'master' into sebas/kplugins 2013-07-18 11:59:42 +02:00
Benjamin Port
9d6dacddc0 Kio was finally renamed KIO 2013-07-17 10:26:22 +02:00
Benjamin Port
9105b715f8 KJS instead of kjs 2013-07-17 10:19:31 +02:00
Sebastian Kügler
668a1bc05e Merge branch 'master' into sebas/kplugins 2013-07-16 17:49:21 +02:00
Benjamin Port
95870ffae2 Rename kio to Kio 2013-07-16 15:37:03 +02:00
Benjamin Port
d5aeff71e1 Use KTextWidgets instead of ktextwidgets 2013-07-16 13:31:52 +02:00
Benjamin Port
bf2402d3a3 Use KCrash target 2013-07-16 12:32:07 +02:00
Benjamin Port
43d7cc1f9c remove find old ki18n 2013-07-15 15:36:03 +02:00
Benjamin Port
3a1e6afb42 Rename targets accordingly to their new name in framework 2013-07-15 15:24:25 +02:00
Kevin Ottens
9135b8c161 kguiaddons -> KGuiAddons 2013-07-15 10:20:40 +02:00
Benjamin Port
9f13125a6e Update CMakeLists in order to take in consideration KDE Frameworks target name change. 2013-07-14 18:17:30 +02:00
Sebastian Kügler
0236f2657f Merge branch 'master' into sebas/kplugins 2013-07-12 10:47:00 +02:00
Sebastian Kügler
ffe01a6b5f Add KCrash framework
Needed to build against latest kdelibs.
2013-07-12 10:46:15 +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
63212c0fa6 Merge branch 'master' into sebas/kplugins
Conflicts:
	CMakeLists.txt
2013-07-10 03:55:12 +02:00
Sebastian Kügler
718298fa2c Fix indentation 2013-07-10 03:54:37 +02:00
Sebastian Kügler
20e67f4db6 Merge branch 'master' into sebas/kplugins
Conflicts:
	CMakeLists.txt
2013-07-10 03:48:15 +02:00
Sebastian Kügler
dcc5b79aba Adapt to latest buildsystem changes 2013-07-10 00:12:26 +02:00
Sebastian Kügler
f770f2903c ktextwidgets is gone 2013-07-10 00:12:26 +02:00
Alex Neundorf
a99fb9d901 -require cmake 2.8.11
plasma-frameworks doesn't seem to build with 2.8.10.1:
qt5/include/QtCore/qglobal.h:975:4: error: #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC or -fPIE."

This is most probably related to all the target-property related work from Stephen in CMake 2.8.11.

Alex
2013-07-09 23:12:35 +02:00
Sebastian Kügler
21c04fd3d3 Merge branch 'master' into sebas/kplugins
Conflicts:
	CMakeLists.txt
2013-07-09 02:34:36 +02:00
Sebastian Kügler
d61e2a44b2 Adapt to latest buildsystem changes 2013-07-09 02:29:57 +02:00
Sebastian Kügler
4fffde0547 ktextwidgets is gone 2013-07-08 01:39:55 +02:00
Sebastian Kügler
1894bec012 Add disabled option to not show warnings
When reading the build output, this can help a bit to find the actual
error while porting.
2013-07-08 00:15:37 +02:00
Aleix Pol
b66943c9c5 fix compilation
Those components are required by some libraries. It seems to me that
this should be fixed elsewhere, but also it's not acceptable to have
modules that aren't compiling.
2013-07-03 19:19:30 +02:00
Sebastian Kügler
07c17812ca Merge branch 'master' into plugins
Conflicts:
	CMakeLists.txt
2013-07-01 04:17:09 +02:00
Sebastian Kügler
dac60f8ab8 Load the time engine and get data out of it. 2013-06-29 05:50:59 +02:00
Ivan Čukić
ef11741bbf Enabling C++11 flags for clang and gcc 2013-06-29 05:50:59 +02:00
Kevin Ottens
597397b41f Revert "Enabling C++11 flags for clang and gcc"
This reverts commit 7c5e2e49ae.

In KF5, C++11 is not to be assumed on all our platforms. So don't force
it from cmake. That said we have to make sure our code builds in both
case (C++11 available or not). I'll get in touch with the build.kde.org
admins to sort that out.

CCMAIL: ivan.cukic@kde.org
2013-06-28 10:07:49 +02:00
Kevin Ottens
f9f11653ee KIconThemes have to come first 2013-06-28 07:54:08 +02:00
Ivan Čukić
7c5e2e49ae Enabling C++11 flags for clang and gcc 2013-06-23 10:37:36 +02:00
Sebastian Kügler
66e8c5aee8 KWallet has moved out of kdeui 2013-06-21 02:22:42 +02:00
Sebastian Kügler
fae07da91c Bump required Qt version to a more realistic 5.2.0 2013-06-21 01:38:58 +02:00
Sebastian Kügler
9e6295d6b3 update comment accordingly 2013-06-19 02:53:49 +02:00
Sebastian Kügler
1fa0ab960b kguiaddons and KDE4_DEFINITIONS are not needed anymore
Also add a comment to the KDE4Libs find
2013-06-19 01:15:28 +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
Sebastian Kügler
d492584d39 Clean up macro usage
exclusively use the installPackage definition from PlasmaMacros.cmake
2013-06-13 02:19:37 +02:00
Sebastian Kügler
1156d89fce find package plasma works now 2013-06-13 01:43:35 +02:00
Sebastian Kügler
7ca5c68ddb Merge branch 'master' into cmake-config 2013-06-13 00:56:55 +02:00
Kevin Ottens
67c901db1a Turns out order still matters... 2013-05-08 10:08:26 +02:00