Commit Graph

163 Commits

Author SHA1 Message Date
David Faure
4152a12390 Upgrade ECM version requirement and KF5 version. 2014-03-01 12:52:02 +01:00
Michael Palimaka
3b7bac1e78 Remove unused dependencies.
REVIEW: 116081
2014-02-26 23:40:55 +11:00
Jonathan Riddell
cd4a778948 set SOVERSION to 5 2014-02-25 20:11:28 +00:00
Martin Gräßlin
1249e5bfc1 Follow Qt's OpenGL compile flags
Only link against OpenGL if Qt links against OpenGL. This ensures
that we don't run into issues if Qt links GLES and plasma links
GL because that's found.

REVIEW: 115990
2014-02-24 09:43:13 +01:00
Alex Merry
596abe8c68 Use ecm_configure_package_config_file
Ported with:
sed -i -e 's/\(include(\)CMake\(PackageConfigHelpers)\)/\1ECM\2/' \
       -e 's/\<\(configure_package_config_file\)/ecm_\1/' \
       CMakeLists.txt

See http://commits.kde.org/extra-cmake-modules/139f60d81653888f696ef433
2014-02-18 21:18:16 +00:00
Michael Palimaka
c9c4e6c3b2 Remove unused system dependencies.
- plasma_appletscript_declarative includes QtUiTools but doesn't use it
- QtPrintSupport is not used anywhere
- Xss, Xext, and SM are not used anywhere
- OpenSSL is not used anywhere

REVIEW: 115830
2014-02-18 03:12:12 +11:00
Martin Gräßlin
bada0c97ba Ensure that we can build without X11 or XCB
* X11 is optional dependency
* XCB is optional dependency
* Qt::X11Extras is only found if both X11 and XCB are found
* switch to HAVE_X11 instead of X11_FOUND in CMakeLists
* remove/fix custom added definitions
* use #if HAVE_X11 instead of #ifdef HAVE_X11 (that is always true)

REVIEW: 115698
2014-02-12 16:20:42 +01:00
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