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

397 Commits

Author SHA1 Message Date
David Faure
72c4428b03 Fix compilation after kservice framework extraction 2012-09-18 18:23:40 +02:00
David Faure
9b571ddec0 Add dummy file so that the "images" subdir exists in git. 
This fixes the packagestructuretest plasma unittest. All green!
 2012-08-19 10:39:57 +02:00
David Faure
986cf06b49 Fix expected result after port to QUrl. 2012-08-19 10:36:34 +02:00
David Faure
b68a8147b2 Update expected test result after port to QUrl 2012-08-18 22:47:41 +02:00
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
9d6bf88aba My computer isn't that fast apparently... 2012-07-06 09:08:17 +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
David Faure
978df0524d Port away from KStandardDirs::realFilePath() 2012-07-01 10:23:15 +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
Kevin Ottens
dad0d5c8ac Moving karchive to tier1 2012-06-04 18:36:04 +02:00
Script Kiddy
d68f439477 SVN_SILENT made messages (.desktop file) 2012-05-11 15:12:49 +02:00
David Faure
0ee8271d83 Make plasma compiled even without gpgme 2012-04-28 21:56:51 +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
bf9651c51a Remove last usage of kgenericfactory.h 2012-02-21 00:11:36 +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
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