alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
083d157684
plasma-framework/private/qtjolie-branch/tests
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
..
calculatorclient.ol And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
calculatorservice.cpp Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 2012-02-14 12:32:25 +01:00
CMakeLists.txt prefix the last unittests (that use a macro, at least) 2010-10-05 14:47:38 +00:00
math.ol And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
printer.ol And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
testfault.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
testhelpers.h And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
testmessage.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
testmetaservice.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
testprinter.cpp Don't use the QtGui module name in includes. 2012-02-02 10:35:53 +01:00
testvalue.cpp And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00
trivialyahooclient.cpp Don't use the QtGui module name in includes. 2012-02-02 10:35:53 +01:00
visiondriver.cpp Don't use the QtGui module name in includes. 2012-02-02 10:35:53 +01:00
visiondriverwidget.ui And port to the new api, and rename the copy. 2009-09-15 11:12:45 +00:00