Commit Graph

7311 Commits

Author SHA1 Message Date
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
Marco Martin
3c62cc7881 partial revert of 1db495ef44dfc101ca6baa0349bcd5e97019d3d0
revert all the files that shouldn't have been modified
2012-03-02 10:40:18 +01:00
Marco Martin
d24fbdc4c7 don't rerun popupConstraintsEvent
if the icon situation is correct
2012-03-02 10:10:36 +01:00
Marco Martin
ef43e94b83 Merge branch 'KDE/4.8' of git://anongit.kde.org/kdelibs into KDE/4.8 2012-03-01 22:52:21 +01:00
Marco Martin
94a074203a if the icon changes do a popupConstraintsEvent
the decision always collapsed or not could have changed (if the icon becomes valid or isn't valid anymore)
2012-03-01 22:51:13 +01:00
Kevin Ottens
7d93565b6d Move kauth back to staging 2012-02-29 23:36:20 +01:00
Kevin Ottens
57ff66aac0 Comply to the standard directory organization 2012-02-29 23:36:20 +01:00
Marco Martin
7c959ff917 operations completely delegated to coronabase 2012-02-28 20:40:28 +01:00
Marco Martin
26d4132e42 use an internal coronabase
delegate functions to it
2012-02-28 20:24:41 +01:00
Marco Martin
8b00555903 move some stuff in qgv's private 2012-02-28 20:00:42 +01:00
Marco Martin
024b90c247 layoutcontainments is qgv specific 2012-02-28 19:39:31 +01:00
Marco Martin
dba549382b coronabase, a pure qobject corona 2012-02-28 19:22:59 +01:00
Marco Martin
570585f666 reorder files to tell what must be moved out 2012-02-28 18:15:00 +01:00
Marco Martin
ea79a90fd2 style not needed in the base lib 2012-02-28 18:10:49 +01:00
Marco Martin
3e9798893c remove applet dependency 2012-02-28 18:08:17 +01:00
Marco Martin
c8a1b35f78 cleanupanddelete is qgv specific too 2012-02-28 16:52:11 +01:00
Marco Martin
abadc77276 move something more in the qgv class 2012-02-28 16:42:22 +01:00
Stephen Kelly
39afa5498b Fix Qt5 build.
The operator QString() has been removed.
2012-02-27 10:51:45 +01:00
Patrick Spendrin
9a1eda0cbf fix crash on windows 2012-02-26 00:17:19 +01:00
Script Kiddy
4d2620ca58 SVN_SILENT made messages (.desktop file) 2012-02-25 15:44:16 +01:00
Matt Williams
57bcc67921 Port from KProcess to QProcess 2012-02-21 15:32:34 +00:00