alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2a909445bd
plasma-framework/private/qtjolie-branch/qtjolie
History
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
..
abstractadaptor.cpp Fix compilation with the new cmake automoc stuff. 2012-02-08 23:34:07 +01:00
abstractadaptor.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
client_p.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
client.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
client.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
clientthread_p.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
clientthread.cpp Remove moc includes that can be omitted. 2012-01-31 22:44:36 +01:00
CMakeLists.txt - made kdelibs for wince static 2010-07-30 12:31:39 +00:00
fault.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
fault.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
message.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
message.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
metaservice.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
metaservice.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
pendingcall_p.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
pendingcall.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
pendingcall.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
pendingcallwatcher.cpp Fix compilation with the new cmake automoc stuff. 2012-02-08 23:34:07 +01:00
pendingcallwatcher.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
pendingreply.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
pendingreply.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
QtJolie.pc.cmake And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
QtJolie.prf.cmake And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
server_p.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
server.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
server.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
serverthread_p.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
serverthread.cpp Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 2012-02-14 12:32:25 +01:00
sodephelpers_p.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
value.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
value.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00