Commit Graph

11466 Commits

Author SHA1 Message Date
Sebastian Kügler
20e67f4db6 Merge branch 'master' into sebas/kplugins
Conflicts:
	CMakeLists.txt
2013-07-10 03:48:15 +02:00
Sebastian Kügler
0d2b2e2893 Port widgetsexplorer from KStandardDirs to QStandardPaths 2013-07-10 03:46:22 +02:00
Sebastian Kügler
d56bf246de Port PluginLoader from KStandardDirs to QStandardPaths 2013-07-10 03:27:19 +02:00
Sebastian Kügler
0822e4cb9e Applet::globalShortcut becomes QKeySequence
- Port away from KShortcut
- Use QKeySequence instead of QShortcut (which might be the obvious
  choice, for two reasons:
	- QKeySequence doesn't require QWidgets
	- It's really all we need

This reduces KShortcut and QShortcut usage in plasma-framework to zarro.
2013-07-10 02:33:28 +02:00
Sebastian Kügler
843ad0b429 Remove kmenu include -- reduces warnings 2013-07-10 02:32:30 +02:00
Sebastian Kügler
946a800a7a Replace QAction with KAction in containment
With this commit, plasma-framework is free from (direct) usage of
KAction. \o/

Removes any left-over KAction includes and fw-declarations.
2013-07-10 01:59:39 +02:00
Sebastian Kügler
af46f93a57 Corona's lock action becomes a QAction 2013-07-10 01:49:59 +02:00
Sebastian Kügler
fc2afcb9a1 Port global applet shortcut from KAction to QAction
- use QAction instead of KAction
- use KGlobalAccel for global shortcut registration and query
2013-07-10 01:45:41 +02:00
Sebastian Kügler
e02925b7b5 Use QAction internally in defaultActions() 2013-07-10 00:15:55 +02:00
Sebastian Kügler
dcc5b79aba Adapt to latest buildsystem changes 2013-07-10 00:12:26 +02:00
Sebastian Kügler
46cbf56226 Use module name in includes 2013-07-10 00:12:26 +02:00
Sebastian Kügler
aff9c00761 KMenu becomes QMenu throughout 2013-07-10 00:12:26 +02:00
Sebastian Kügler
f770f2903c ktextwidgets is gone 2013-07-10 00:12:26 +02:00
Sebastian Kügler
6edfe46e56 Use QAction internally in defaultActions() 2013-07-10 00:11:58 +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
ca3d78dd46 Use module name in includes 2013-07-09 01:50:34 +02:00
Sebastian Kügler
ca5c059ecf KMenu becomes QMenu throughout 2013-07-09 00:55:03 +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
Sebastian Kügler
a54763b247 Add script to replace slots with Q_SLOTS 2013-07-08 00:14:51 +02:00
Sebastian Kügler
e9a459a262 Instantiate KPluginInfo from args
This uses the new ctor in KPluginInfo, which handles the args passed
from KPluginLoader nicely and constructs a KPluginInfo from them.
2013-07-04 02:58:26 +02:00
Sebastian Kügler
377e0d72f3 fix some includes in porting script 2013-07-03 22:29:20 +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
Aleix Pol
80bf4d66da Adapt to changes in QCommandLine 2013-07-03 19:16:19 +02:00
Sebastian Kügler
de78cb0b95 Port away from KService usage 2013-07-03 17:22:39 +02:00
Sebastian Kügler
c035f704a1 Port away from KService usage 2013-07-03 17:22:20 +02:00
Sebastian Kügler
5d41347527 Experiment with loading the KPluginInfo from the plugin's metadata 2013-07-03 05:13:25 +02:00
Sebastian Kügler
a9c022f5b9 Cleanups 2013-07-03 05:12:30 +02:00
Sebastian Kügler
95aa0eee7d remove tdata accessor again 2013-07-03 00:41:54 +02:00
Sebastian Kügler
f9502edb14 Convert to use QVariantMap throughout
This makes it possible again to use DataSource.data from QML. Some more
optimizations are needed, but it already basically works.
2013-07-03 00:39:54 +02:00
Sebastian Kügler
ad08301db4 Add temporary QVariantMap data accessor 2013-07-02 03:21:30 +02:00
Marco Martin
5b0b17f86a respect contents hints 2013-07-01 18:21:29 +02:00
Sebastian Kügler
8b2eae67c5 Add missing cmake file 2013-07-01 13:51:04 +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
9c15442cc6 fix some includes in porting script 2013-07-01 03:59:03 +02:00
Sebastian Kügler
13e7584eea Port to new macro 2013-07-01 03:58:25 +02:00
Sebastian Kügler
a21400096a Load the time engine from the KService 2013-06-29 05:50:59 +02:00
Sebastian Kügler
9035691567 Adjust test to new api 2013-06-29 05:50:59 +02:00
Sebastian Kügler
6c0a13f3b1 use create factory 2013-06-29 05:50:59 +02:00
Sebastian Kügler
849d0a2b17 header has changed 2013-06-29 05:50:59 +02:00
Sebastian Kügler
dac60f8ab8 Load the time engine and get data out of it. 2013-06-29 05:50:59 +02:00
Sebastian Kügler
a05373595d fix some includes in porting script 2013-06-29 05:50:59 +02:00
Ivan Čukić
1680e728ee Properly initialize kded dbus object
- kded module uses underscore instead of a dash
- dbus interface is based on the generated adapter
- added the d_ptr template class
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
Kevin Ottens
be417bd8b3 Just in case we'd have just a local path 2013-06-27 22:58:24 +02:00
Kevin Ottens
12b2cdd19a Now this returns true 2013-06-27 18:36:20 +02:00