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
Jaime Torres
fe259f19bb
include missing initializations
...
an uninitialized variable can be the origin of several bugs.
unfortunately, not the one I suffer.
REVIEW: 106781
2012-10-10 19:07:06 +02:00
Aaron Seigo
97a13a9dbe
make DataEngineConsumer public API
...
this will become the prefered way to access DataEngines rather than
DataEngineManager which exposes implementation details that need to
be manually managed
2012-09-24 15:52:16 +02:00
Aaron Seigo
1dde80056b
no longer provide access to the package from the class, let Package do that; adapt to Package merge
2011-07-15 13:02:15 +02:00
Chani Armitage
31e2c5a0d4
shared containmentactions
...
svn path=/trunk/KDE/kdelibs/; revision=1195744
2010-11-11 22:22:39 +00:00
John Layt
6e9943e36c
krazy fixes, mostly include guards and copyright tags
...
svn path=/trunk/KDE/kdelibs/; revision=1066779
2009-12-27 22:16:11 +00:00
Chani Armitage
d2cf2d781c
replace hasConfig functions with a .desktop entry
...
svn path=/trunk/KDE/kdelibs/; revision=1015267
2009-08-25 03:22:15 +00:00
Chani Armitage
f9317c11e6
no more d->containment
...
svn path=/trunk/KDE/kdelibs/; revision=1014483
2009-08-23 01:13:25 +00:00
Chani Armitage
2ab601f945
various bits of cleanup:
...
load requires a containment
fix @since (I could've sworn I did this already..)
rename ContextAction->ContainmentActions
misc. improvements from aaron
no more warnings
qDeleteAll
don't iterate with keys()
svn path=/trunk/KDE/kdelibs/; revision=1012647
2009-08-17 22:31:32 +00:00
