Commit Graph

2 Commits

Author SHA1 Message Date
David Faure
e7e77f118a Merge remote-tracking branch 'origin/KDE/4.10' into frameworks
Conflicts:
	cmake/modules/FindKDE4Internal.cmake [ON vs TRUE]
	experimental/libkdeclarative/kdeclarative.cpp [include changes]
	kdecore/CMakeLists.txt [kshareddatacache.cpp exception support, but file moved]
	kdecore/kernel/kcmdlineargs.cpp [+1 option, but qi18n]
	kdeui/widgets/ktextedit.cpp [moc]
	kdewebkit/kwebpage.cpp [QUrl]
	kfile/kfilewidget.cpp [QUrl]
	kfile/kurlnavigatortogglebutton.cpp [QT_NO_ACCESSIBILITY]
	kinit/kinit.cpp [document path]
	kio/kfile/kurlrequester.cpp [KDE::icon]
	kio/kio/kprotocolmanager.cpp [kded5]
	kio/kio/krun.cpp [document path]
	kioslave/ftp/ftp.cpp [QUrl]
	kioslave/http/kcookiejar/CMakeLists.txt [upd file resurrected]
	kioslave/http/kcookiejar/kcookiescfg.upd [resurrected]
	kioslave/http/kcookiejar/kcookiewin.cpp [KVBox porting]
	mimetypes/kde.xml [kexi gone]
	nepomuk/core/resourcedata.cpp [deleted]
	nepomuk/test/CMakeLists.txt [deleted]
	plasma/private/packages.cpp [Plasma::Applet::NoBackground]
	tier1/kjs/src/kjs/jsonstringify.cpp [unsigned int]
	tier1/solid/src/solid/CMakeLists.txt [hello udisks2]
2012-10-19 15:10:38 +02:00
Marco Martin
095a196120 move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00