alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,333 Commits 1 Branch 0 Tags 40 MiB
fa8d1046ef
Commit Graph

112 Commits

Author SHA1 Message Date
David Faure
fa8d1046ef Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 
Conflicts:
	CMakeLists.txt [version number]
	cmake/modules/KDE4Macros.cmake [modifications to dead code]
	interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop [deleted]
	interfaces/ktexteditor/ktexteditorplugin.desktop [deleted]
	kparts/tests/partviewer.cpp [includes]
	nepomuk/core/nepomukmainmodel.cpp [deleted]
	nepomuk/core/resource.cpp [deleted]
	nepomuk/test/CMakeLists.txt [deleted]
	tier1/kcoreaddons/src/io/klockfile_unix.cpp [already fixed]
	tier1/solid/src/solid/backends/hal/halmanager.cpp [modifications to dead code, AFAICS]
 2012-08-16 13:24:21 +02:00
Script Kiddy
631d858e6a SVN_SILENT made messages (.desktop file) 2012-08-06 09:28:55 +02:00
David Faure
fc73e05210 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks 
Conflicts:
	CMakeLists.txt [versioning]
	kio/kio/accessmanager.cpp [headers]
	tier1/solid/src/solid/backends/wmi/wmiacadapter.cpp [Q_EMIT]
	tier1/solid/src/solid/backends/wmi/wmibattery.cpp [Q_EMIT]
 2012-07-02 15:53:39 +02:00
Script Kiddy
6efd9f1c99 SVN_SILENT made messages (.desktop file) 2012-06-26 19:13:32 +02:00
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
Script Kiddy
d68f439477 SVN_SILENT made messages (.desktop file) 2012-05-11 15:12:49 +02: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
Script Kiddy
4d2620ca58 SVN_SILENT made messages (.desktop file) 2012-02-25 15:44:16 +01:00
David Faure
083d157684 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 
Conflicts:
	kdecore/network/k3datagramsocket.cpp
	kdeui/actions/kstandardaction.cpp
	kdeui/dialogs/kconfigdialogmanager.cpp
	kdeui/icons/kicondialog.cpp
	kdeui/itemviews/kviewstatesaver.h
	kfile/knewfilemenu.cpp
	kio/misc/kpac/downloader.cpp
	kio/tests/kdirlistertest.cpp
	kparts/browserextension.cpp
	nepomuk/core/nepomukmainmodel.cpp
	nepomuk/query/queryserviceclient.cpp
	nepomuk/test/ratingpaintertestwidget.cpp
	nepomuk/ui/kedittagsdialog.cpp
	nepomuk/ui/ktagcloudwidget.cpp
	nepomuk/ui/ktagdisplaywidget.cpp
	nepomuk/ui/nepomukmassupdatejob.cpp
	nepomuk/ui/tagwidget.cpp
	nepomuk/utils/daterangeselectionwidget.cpp
	nepomuk/utils/facetwidget.cpp
	nepomuk/utils/searchwidget.cpp
	plasma/containment.cpp
	plasma/datacontainer.cpp
	plasma/deprecated/animator.cpp
	plasma/extenders/extender.cpp
	plasma/plasma.h
	plasma/scripting/wallpaperscript.cpp
	tier1/solid/tests/networkingclient.cpp
(signal/slot normalization changes conflicted with KUrl->QUrl changes
and with other changes in frameworks)
 2012-02-14 12:32:25 +01:00
Dawit Alemayehu
fb0b49af8c Normalize all signal/slot connections. 
REVIEW: 103728
 2012-02-13 14:27:21 -05:00
Stephen Kelly
d660ec244e Merge remote-tracking branch 'origin/KDE/4.8' into frameworks 2012-02-07 12:38:06 +01:00
Script Kiddy
d66cc2099b SVN_SILENT made messages (.desktop file) 2012-02-02 15:05:02 +01:00
Stephen Kelly
8d37df4b8f Remove moc includes that can be omitted. 
Mostly these are "<name>.moc" style includes which are incorrect
compared to qmake and cmake automoc behaviour.
 2012-01-31 22:44:36 +01:00
Script Kiddy
fd2357e7d9 SVN_SILENT made messages (.desktop file) 2012-01-20 10:46:57 +01:00
Script Kiddy
aa2f54b8ae SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
Script Kiddy
74b1a3e233 SVN_SILENT made messages (.desktop file) 2012-01-14 09:38:32 +01:00
Script Kiddy
10cd7b1aa7 SVN_SILENT made messages (.desktop file) 2012-01-07 09:21:08 +01:00
Script Kiddy
1b541d478e SVN_SILENT made messages (.desktop file) 2012-01-06 08:39:57 +01:00
Script Kiddy
a229500102 SVN_SILENT made messages (.desktop file) 2012-01-03 16:53:17 +01:00
Script Kiddy
7126ebd18a SVN_SILENT made messages (.desktop file) 2011-12-29 10:46:14 +01:00
Script Kiddy
f8c1d76547 SVN_SILENT made messages (.desktop file) 2011-12-22 11:44:55 +01:00
Script Kiddy
e01191b409 SVN_SILENT made messages (.desktop file) 2011-12-21 09:59:40 +01:00
Script Kiddy
5e7e9dc6b8 SVN_SILENT made messages (.desktop file) 2011-10-08 14:50:33 +02:00
Script Kiddy
b736b76203 SVN_SILENT made messages (.desktop file) 2011-07-07 18:43:55 +02:00
Script Kiddy
4af42a0986 SVN_SILENT made messages (.desktop file) 2011-07-06 19:16:46 +02:00
Script Kiddy
41211c2536 SVN_SILENT made messages (.desktop file) 2011-06-08 09:37:08 +02:00
Script Kiddy
68569d25fd SVN_SILENT made messages (.desktop file) 2011-05-29 10:22:13 +02:00
Script Kiddy
3eba58f795 SVN_SILENT made messages (.desktop file) 2011-05-08 09:42:51 +02:00
Script Kiddy
38fd4f487f SVN_SILENT made messages (.desktop file) 2011-04-30 09:25:22 +02:00
Script Kiddy
214a8eb3ad SVN_SILENT made messages (.desktop file) 2011-04-13 08:59:18 +02:00
Script Kiddy
ea379be495 SVN_SILENT made messages (.desktop file) 2011-04-12 10:18:54 +02:00
Script Kiddy
6aac9f5b45 SVN_SILENT made messages (.desktop file) 2011-03-02 08:46:12 +01:00
Script Kiddy
fb98c62ee8 SVN_SILENT made messages (.desktop file) 2011-02-14 16:33:43 +01:00
Script Kiddy
fd20134a3e SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1217161
 2011-01-26 06:34:42 +00:00
Script Kiddy
e33f5ea828 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1215657
 2011-01-19 06:34:21 +00:00
Script Kiddy
a6dc2ba624 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1214745
 2011-01-16 05:46:29 +00:00
Script Kiddy
904ad74970 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1214317
 2011-01-14 06:01:34 +00:00
Script Kiddy
9494527c60 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1213673
 2011-01-11 09:13:33 +00:00
Script Kiddy
f0793a0126 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1207961
 2010-12-20 06:27:11 +00:00
Script Kiddy
973aaca5f9 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1203691
 2010-12-05 05:30:27 +00:00
Script Kiddy
8c5b878c8e SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1201313
 2010-11-27 10:53:25 +00:00
Script Kiddy
5ef3f6feab SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1200938
 2010-11-26 10:12:58 +00:00
Script Kiddy
8e5bcfc79c SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1199960
 2010-11-23 11:26:33 +00:00
Script Kiddy
0ffeb0be68 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1198695
 2010-11-19 09:51:33 +00:00
Script Kiddy
6764ddfe03 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1196580
 2010-11-13 15:50:09 +00:00
Script Kiddy
58fdcb472b SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1195481
 2010-11-11 10:01:08 +00:00
Script Kiddy
4e646b8526 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1191245
 2010-10-30 08:48:50 +00:00
Script Kiddy
0bd34bdd36 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1188902
 2010-10-23 09:32:21 +00:00
Script Kiddy
0d2f369206 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1186162
 2010-10-15 09:12:05 +00:00
Script Kiddy
efb8c987ee SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1182665
 2010-10-05 10:17:36 +00:00