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

380 Commits

Author SHA1 Message Date
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
b1b68adb7d Don't use the QtGui module name in includes. 
In Qt5, many of them are moved to QtWidgets, so this is the only
way to be source compatible with both Qt 4 and Qt 5.
 2012-02-02 10:35:53 +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
David Faure
656d7a2d99 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 
Conflicts:
	CMakeLists.txt (version)
	plasma/data/services/plasma-applet-extenderapplet.desktop (deleted in frameworks)
 2012-01-23 11:06:24 +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
David Faure
8a2318f741 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 
Conflicts:
	kfile/knewfilemenu.cpp
 2012-01-16 14:25:19 +01:00
Script Kiddy
74b1a3e233 SVN_SILENT made messages (.desktop file) 2012-01-14 09:38:32 +01:00
David Faure
6a01732860 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 
Conflicts:
	CMakeLists.txt [version number]
	kdecore/tests/kcharsetstest.cpp [deleted]
 2012-01-13 11:29:36 +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
David Faure
809bbd7b14 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 
Conflicts:
	CMakeLists.txt
	plasma/corona.h
	plasma/data/services/plasma-applet-extenderapplet.desktop
	plasma/data/servicetypes/plasma-packagestructure.desktop
 2011-12-22 19:53:10 +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
Stephen Kelly
846426335f Move libkarchive to kdecore. 
It still depends on kdecore, and too much stuff depends on it for
it to be commented out for now.
 2011-11-23 11:32:18 +01:00
Kevin Funk
5761d0f84b Make compile/link 
Add missing link targets to plasma libs
Remove -pedantic from polkit translation unit

Ack'ed by dfaure.
 2011-11-17 10:46:40 +01:00
Aaron Seigo
819fdf5f23 put the contents hash into a more sensibly named file 2011-11-09 13:12:41 +01:00
Aaron Seigo
2c7751ccef Merge remote-tracking branch 'origin/KDE/4.7' into frameworks 
Conflicts:
	CMakeLists.txt
	kio/kio/kfileitem.cpp
	plasma/datacontainer.cpp
	plasma/datacontainer.h
	plasma/private/wallpaper_p.h
	plasma/private/wallpaperrenderthread.cpp
 2011-10-30 10:44:59 +01:00
Script Kiddy
4371c365fa SVN_SILENT made messages (.desktop file) 2011-10-28 14:12:20 +02:00
Script Kiddy
4cc0c2fbd6 SVN_SILENT made messages (.desktop file) 2011-10-22 14:56:58 +02:00
Stephen Kelly
cdad77050d Merge remote-tracking branch 'origin/KDE/4.7' into frameworks 2011-10-18 22:11:25 +02:00
Script Kiddy
5e7e9dc6b8 SVN_SILENT made messages (.desktop file) 2011-10-08 14:50:33 +02:00
Stephen Kelly
e23c2dfbd6 Merge remote-tracking branch 'origin/KDE/4.7' into frameworks 
Conflicts:
	CMakeLists.txt
	cmake/modules/FindNepomuk.cmake
	kdecore/tests/kstandarddirstest.cpp
	kdeui/util/kkeyserver.h
	kio/kio/accessmanagerreply_p.h
	kio/kio/hostinfo.cpp
	plasma/containment.cpp
	plasma/data/services/plasma.protocol
	plasma/popupapplet.cpp
	plasma/tooltipcontent.h
	plasma/widgets/videowidget.h
 2011-08-25 19:43:08 +02:00
Marco Martin
33e9192346 Merge branch 'libplasma2' into frameworks 
Conflicts:
	plasma/CMakeLists.txt
	plasma/popupapplet.cpp
 2011-08-12 11:45:49 +02:00
Mario Bensi
19ee3c1a56 Build fix 
Add karchive missing include
 2011-08-11 01:28:13 +02:00
Aaron Seigo
82eee5c3b7 avoid compiling in debug strings when compiled without debug 2011-07-29 15:46:52 +02:00
Aaron Seigo
c0a60951a5 add a test for copy-n-fetch performance; make list based checks list order independant 2011-07-22 17:24:10 +02:00
Aaron Seigo
e0d8147e54 fix up test 2011-07-21 15:18:54 +02:00
Aaron Seigo
5b4f61a10a hashing value changed on package 2011-07-21 15:18:45 +02:00
Aaron Seigo
9701a7a2ad build 2011-07-21 14:48:12 +02:00
Aaron Seigo
d89eebe1be fixes for tests.. not quite 100% yet, but getting there. 2011-07-19 21:37:08 +02:00
Aaron Seigo
6c21a28382 5 pass, 1 fail. to celebrate, some minor cleanups ;) 2011-07-15 14:18:17 +02:00
Aaron Seigo
acb2644b16 -2 failing tests 2011-07-15 14:09:19 +02:00
Aaron Seigo
cebb2ea6d6 port the tests 2011-07-15 12:58:56 +02:00
Aaron Seigo
643045abf3 fix the test 2011-07-08 20:47:42 +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
Aaron Seigo
c19f04c2f4 Merge remote-tracking branch 'origin/master' into libplasma2 
Conflicts:
	plasma/CMakeLists.txt
 2011-06-09 13:02:49 +02:00
Script Kiddy
41211c2536 SVN_SILENT made messages (.desktop file) 2011-06-08 09:37:08 +02:00
Aaron Seigo
36255d10cf remove the test 2011-05-31 01:02:57 +02:00
Aaron Seigo
8f6b17fb0e --PackageMetadata; 2011-05-31 00:59:35 +02:00
Aaron Seigo
b9fa4cca32 Merge remote-tracking branch 'origin/master' into libplasma2 2011-05-30 23:44:05 +02:00
Aaron Seigo
cd32321b68 Merge branch 'libplasma2_signedpackages' into libplasma2 
Conflicts:
	plasma/package.cpp
 2011-05-30 23:41:53 +02:00
Script Kiddy
68569d25fd SVN_SILENT made messages (.desktop file) 2011-05-29 10:22:13 +02:00
Aaron Seigo
b0c769c4c1 this feature is no longer tied to QCA 2011-05-27 12:27:52 +02:00