Commit Graph

7281 Commits

Author SHA1 Message Date
Stephen Kelly
9d49500245 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
Conflicts:
	CMakeLists.txt
	interfaces/terminal/example/CMakeLists.txt
	kdecore/CMakeLists.txt
	kdeui/actions/ktogglefullscreenaction.cpp
	kdeui/widgets/khelpmenu.cpp
	kio/kio/accessmanager.cpp
	kio/kio/accessmanagerreply_p.cpp
	nepomuk/core/nepomukmainmodel.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcemanager.cpp
	nepomuk/query/andterm_p.h
	nepomuk/query/comparisonterm.cpp
	nepomuk/query/comparisonterm_p.h
	nepomuk/query/literalterm.cpp
	nepomuk/query/literalterm_p.h
	nepomuk/query/negationterm.cpp
	nepomuk/query/negationterm_p.h
	nepomuk/query/optionalterm.cpp
	nepomuk/query/optionalterm_p.h
	nepomuk/query/orterm.cpp
	nepomuk/query/orterm_p.h
	nepomuk/query/query.cpp
	nepomuk/query/resourceterm.cpp
	nepomuk/query/resourceterm_p.h
	nepomuk/query/resourcetypeterm.cpp
	nepomuk/query/resourcetypeterm_p.h
	nepomuk/query/term_p.h
	plasma/package.cpp
	plasma/private/service_p.h
	plasma/runnermanager.cpp
	staging/kwidgets/autotests/kiconloader_unittest.cpp
	tier1/kcoreaddons/src/caching/kshareddatacache.cpp
	tier1/kdbusaddons/src/kdbusinterprocesslock.cpp
	tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
	tier1/solid/src/solid/backends/wmi/wmicdrom.cpp
	tier1/solid/src/solid/backends/wmi/wmidevice.cpp
	tier1/solid/src/solid/backends/wmi/wmimanager.cpp
	tier1/solid/src/solid/backends/wmi/wmiopticaldisc.cpp
2012-06-16 13:40:47 +02:00
David Faure
d2a0d70fcd Ran convert-kstandarddirs.pl and fixed compilation (includes) in a few places 2012-06-12 15:02:33 +02:00
David Faure
ffdf930f8c Ran kdesdk/scripts/kf5/convert-kstandarddirs.pl 2012-06-12 12:59:34 +02:00
Stephen Kelly
330efc1fa3 Create a QFontMetrics object explicitly with a QFont.
Since 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d in Qt 5 there is
no longer an implicit conversion.
2012-06-08 17:33:16 +02:00
Stephen Kelly
cefe436657 Simplify module-includes
For Qt 5 porting.
2012-06-08 17:33:16 +02:00
Marco Martin
222674d3ab save KCM settings on ok ar apply clicked
BUG:300840
2012-06-07 12:50:05 +02:00
David Faure
907c6c2b02 KStandardDirs => QStandardPaths
(mostly using kf5/convert-kstandarddirs.pl)
2012-06-05 01:16:35 +02:00
Kevin Ottens
dad0d5c8ac Moving karchive to tier1 2012-06-04 18:36:04 +02:00
Aaron Seigo
46a60a4fe8 Package operates locally only as it is, so no point in using KIO here.
this also happens to allow plasmapkg to work outside a kde session.
2012-05-31 14:58:18 +02:00
David Faure
0fd5c690c8 KStandardDirs::locate/locateLocal ported, by script, this time.
(kdesdk/scripts/kf5/convert-kstandarddirs.pl coming up)
2012-05-30 20:25:25 +02:00
Aaron Seigo
1808be9d38 clear the single runner pointer when loading runners; it may have been deleted on us 2012-05-28 19:42:25 +02:00
Aurélien Gâteau
162456d04a Only dequeue our ThreadWeaver jobs
REVIEW-IN: 104973
2012-05-25 19:23:50 +02:00
Stephen Kelly
745b39d905 Port from kde4_add_executable to ecm_mark_as_test. 2012-05-24 23:56:32 +02:00
David Faure
8d7ebc7e89 Finish fixing compilation with Qt4.
Ported KUrlRequester away from KHBox, which was polluting its API.
2012-05-19 12:01:39 +02:00
David Faure
d278887d91 Increase version number in runtime services, to avoid mixups.
Executable names:
kdeinit4 -> kdeinit5
kded4 -> kded

DBus service names:
org.kde.kded -> org.kde.kded5
org.kde.klauncher -> org.kde.klauncher5

This fixes jobtest with Qt5 (difference in QDateTime serialization), but
more generally it will allow BIC changes in SlaveBase, as well as
not crashing due to kdeinit4 or kded4 loading KF5/Qt5 modules, etc.
2012-05-14 01:07:37 +02:00
Aurélien Gâteau
f75b1e7d10 Add operator != to Plasma::QueryMatch 2012-05-12 23:38:55 +02:00
Kevin Ottens
cba3e4c7aa Use kconfig_add_kcfg_files in kdelibs 2012-05-12 17:15:01 +02:00
Script Kiddy
d68f439477 SVN_SILENT made messages (.desktop file) 2012-05-11 15:12:49 +02:00
Alex Merry
c4c2e8ee49 Rename new Plasma::Service method to avoid clashes
Having overloaded Q_INVOKABLE methods where one takes a superclass of
another is a Bad Idea(TM), since the script engine cannot disambiguate
the methods.  associateItem is more accurate than associateWidget for
these methods, anyway.

REVIEW: 104760
2012-05-11 12:31:10 +01:00
Alex Merry
23b50f2dee Allow QML items to be associated with operations in Plasma::Service
QML items derive from QGraphicsObject, but not QGraphicsWidget.  We
actually only need QGraphicsObject (for the enabled property).

This allows calling (dis)associateWidget from QML (eg: in javascript
plasmoids) and passing in a QML item.
2012-05-11 11:55:48 +01:00
Stephen Kelly
4e581398e6 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
Conflicts:
	CMakeLists.txt
	kdeui/kernel/kglobalsettings.cpp
	kdeui/widgets/kmessagewidget.cpp
	nepomuk/core/nepomukmainmodel.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcewatcher.cpp
	solid/solid/backends/fstab/fstabstorageaccess.cpp
	solid/solid/backends/wmi/wmicdrom.cpp
	solid/solid/backends/wmi/wmidevice.cpp
	solid/solid/backends/wmi/wmimanager.cpp
	solid/solid/backends/wmi/wmistorage.cpp
	solid/solid/backends/wmi/wmistorageaccess.cpp
	solid/solid/backends/wmi/wmivolume.cpp
2012-05-06 23:21:17 +02:00
David Faure
657dcbb6dc Revert "Port to const QRegExp behaviour."
This reverts commit 6e8f714e039e9e0b850304ba3df91ab2951a350b.

The Qt5 commit is going to be reverted, and this broke kreplacetest.
2012-05-04 17:31:51 +02:00
David Faure
4ce1afaa9f Enable -DQT_NO_URL_CAST_FROM_STRING globally, and fix the code. 2012-05-02 15:08:52 +02:00
David Faure
11bec3095d KUrl -> QUrl 2012-04-30 22:35:20 +02:00
Aaron Seigo
ab24ad4a6c if we failed to get the appletdescription, then try to get the pluginName from the existing config 2012-04-30 13:09:51 +02:00
Benjamin Port
1fb3fd585c Deprecate LineEdit::clickMessage in order to have a consistant API with KLineEdit
Reviewed by: David Faure
2012-04-30 03:17:58 +02:00
Stephen Kelly
c8d2e51e43 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
Conflicts:
	kdecore/jobs/kjob.h
	kdecore/kernel/kcmdlineargs.cpp
	kdewebkit/kwebpluginfactory.cpp
	plasma/service.cpp
	solid/solid/CMakeLists.txt
	solid/solid/backends/udev/udevdevice.cpp
	solid/solid/backends/udev/udevmanager.cpp
	solid/solid/backends/udev/udevportablemediaplayer.cpp
2012-04-29 13:09:37 +02:00
Stephen Kelly
54f790a2a5 Port to const QRegExp behaviour. 2012-04-29 12:18:30 +02:00
David Faure
a3ec111ed6 Fix compilation of plasma and experimental. 2012-04-28 21:57:20 +02:00
David Faure
0ee8271d83 Make plasma compiled even without gpgme 2012-04-28 21:56:51 +02:00
Julien Desgats
a69cb53cc5 Fixed some QIcon and kiconloader compile errors for Plasma
Reviewed by: Kevin Ottens
2012-04-28 16:57:00 +02:00
David Faure
af211f7c93 KIcon("foo") -> KDE::icon("foo")
include kicon.h -> kiconloader.h, or often, nothing at all.
2012-04-28 13:17:42 +02:00
Alex Merry
4f5974104a Make a kDebug line more helpful
If the operation wasn't known, say what was asked for, not just what
was allowed.
2012-04-27 21:48:35 +01:00
Stephen Kelly
2ffa5b905a Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
Conflicts:
	CMakeLists.txt
	nepomuk/core/resource.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/utils/utils.cpp
2012-04-08 10:55:12 +02:00
John Layt
f404ada067 Remove unneeded klocale.h and kglobal.h
Replace locale.h with klocalizedstring.h where only i18n() needed
2012-04-06 16:42:07 +01:00
Stephen Kelly
4a1df77400 Port from KGlobalSettings::dndEventDelay() to QApplication::startDragDistance() 2012-04-04 11:43:46 +02:00
Kevin Ottens
99309b3695 Move kauth to tier2 2012-04-02 16:10:27 +02:00
Kevin Ottens
5824a028c8 Move kwindowsystem to tier1 2012-04-02 15:30:01 +02:00
Kevin Ottens
e2a21337dc Port to new KAuth API 2012-04-02 02:28:23 +02:00
Kevin Ottens
ab5df11614 Missing include 2012-04-02 02:28:05 +02:00
Claus Christensen
658fad620a Replaced KGlobal::config() by KSharedConfig::openConfig()
Remodified:   kded/kdedadaptor.cpp
2012-03-24 19:33:54 +01:00
Kurt Hindenburg
7463dde514 Allow plasma to build by adding kurl includes 2012-03-24 12:06:28 -04:00
Sune Vuorela
593d35f1b4 no need for plasma to link kdeclarative 2012-03-24 11:51:56 +01:00
Sune Vuorela
101a0b38f1 add some klocale includes to plasma to make it build 2012-03-24 11:51:32 +01:00
Aaron Seigo
dd378ebead unbreak restoration of applets when switching containments 2012-03-19 20:40:14 +01:00
Stephen Kelly
b8f345c3e2 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
Conflicts:
	kdeui/widgets/kdatecombobox.cpp
	kfile/knewfilemenu.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcewatcher.cpp
	nepomuk/core/resourcewatcher.h
	tier1/kcoreaddons/src/caching/kshareddatacache.cpp
2012-03-15 23:33:05 +01:00
Nick Shaforostoff
816efa3b16 disable visual feedback for hovering of lineedit as a workaround for 290111
CCBUG: 290111
2012-03-12 11:46:23 +02:00
David Faure
5ca407c6a0 Move kcoreaddons from staging to tier1, it's done 2012-03-11 23:42:26 +01:00
David Faure
2365f2c657 Some KUrl-QUrl porting. 2012-03-11 10:34:38 +01:00
Stephen Kelly
13d5508112 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
Conflicts:
	CMakeLists.txt
	kdecore/tests/kservicetest.cpp
	kdeui/dialogs/kconfigdialog.h
	kdeui/sonnet/configdialog.cpp
	kdeui/widgets/kpushbutton.cpp
	kdeui/widgets/kpushbutton.h
	kio/kfile/kpropertiesdialog.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcedata.h
	nepomuk/core/resourcemanager.cpp
	nepomuk/core/resourcemanager.h
	nepomuk/core/resourcewatcher.cpp
	nepomuk/core/resourcewatcher.h
	nepomuk/query/queryparser.cpp
	tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
	tier1/solid/src/solid/backends/fstab/fstabstorageaccess.cpp
2012-03-04 21:01:22 +01:00