alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4f3a52cec2
plasma-framework/private/qtjolie-branch/qtjolie
History
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
..
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 include missing initializations 2012-10-10 19:07:06 +02: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