[kde-doc-english] [kdelibs/frameworks] /: Merge remote-tracking branch 'origin/master' into origin-frameworks

[David Faure]

Git commit 0cf81531c4d70b89bafd65a6ffc3522da6269865 by David Faure.
Committed on 12/12/2013 at 23:38.
Pushed by dfaure into branch 'frameworks'.

Merge remote-tracking branch 'origin/master' into origin-frameworks

Conflicts:
	.reviewboardrc [already here]
	kdecore/io/kzip.cpp [git couldn't follow the move!]
	kioslave/http/tests/CMakeLists.txt [same]
	tier1/itemviews/src/kwidgetitemdelegate.cpp [grmbl, revert = conflicts]
	tier1/itemviews/src/kwidgetitemdelegate.h [grmbl, revert]
	tier1/itemviews/src/kwidgetitemdelegatepool.cpp [grmbl, revert]
	tier1/kconfig/src/core/kconfig.cpp [Q_OS_WIN]
	tier1/kconfig/src/core/kdesktopfile.cpp [Q_OS_WIN]
	tier1/kconfig/src/gui/kstandardshortcut.cpp [Q_OS_WIN]
	tier1/kjs/src/wtf/Platform.h [same change already here]
	tier3/kconfigwidgets/src/krecentfilesaction.cpp [Q_OS_WIN]
	tier3/kio/src/core/kmountpoint.cpp [Q_OS_WIN]
	tier3/kservice/src/kbuildsycoca/vfolder_menu.cpp [Q_OS_WIN]
	tier4/kde4support/src/kdecore/kdeversion.h [syntax change vs kde4support]
	tier4/kde4support/src/kdecore/kstandarddirs.cpp [Q_OS_WIN]
	tier4/khtml/src/khtml_part.cpp [qDebug/kDebug]

M  +1    -1    Mainpage.dox
A  +2    -14   tier1/itemviews/src/kcategorizedview.cpp     [License: LGPL (v2+)]
A  +9    -36   tier1/itemviews/src/kwidgetitemdelegate.cpp     [License: LGPL (v2+)]
A  +5    -3    tier1/itemviews/src/kwidgetitemdelegate.h     [License: LGPL (v2+)]
A  +0    -4    tier1/itemviews/src/kwidgetitemdelegate_p.h     [License: LGPL (v2+)]
A  +13   -12   tier1/itemviews/src/kwidgetitemdelegatepool.cpp     [License: LGPL (v2+)]
R  +1    -1    tier1/itemviews/src/kwidgetitemdelegatepool_p.h
A  +29   -0    tier1/karchive/autotests/karchivetest.cpp     [License: LGPL (v2+)]
A  +1    -0    tier1/karchive/autotests/karchivetest.h     [License: LGPL (v2+)]
A  +21   -0    tier1/karchive/src/karchive.cpp     [License: LGPL (v2)]
A  +6    -0    tier1/karchive/src/karchive.h     [License: LGPL (v2)]
A  +1    -1    tier1/karchive/src/klimitediodevice.cpp     [License: LGPL (v2)]
A  +13   -10   tier1/karchive/src/kzip.cpp     [License: LGPL (v2)]
A  +13   -1    tier1/kconfig/src/core/kconfig.cpp     [License: LGPL (v2+)]
A  +9    -3    tier1/kconfig/src/core/kdesktopfile.cpp     [License: LGPL (v2+)]
A  +1    -1    tier1/kconfig/src/gui/kstandardshortcut.cpp     [License: LGPL (v2)]
R  +2    -1    tier1/solid/src/solid/backends/udisks2/udisksstoragedrive.cpp
A  +1    -1    tier1/solid/src/solid/backends/win/winacadapter.cpp     [License: LGPL]
A  +1    -1    tier1/solid/src/solid/backends/win/winacadapter.h     [License: LGPL]
A  +2    -0    tier2/kcompletion/src/kcompletion_p.h     [License: LGPL (v2+)]
A  +1    -1    tier2/kcompletion/src/klineedit.cpp     [License: LGPL (v2+)]
R  +1    -1    tier2/kdoctools/docs/kdeoptions/man-kdeoptions.7.docbook
R  +5    -0    tier3/kcmutils/src/kcmodule.desktop
A  +1    -1    tier3/kconfigwidgets/src/krecentfilesaction.cpp     [License: LGPL (v2)]
A  +13   -7    tier3/kio/src/core/kmountpoint.cpp     [License: LGPL (v2)]
A  +1    -1    tier3/kio/src/core/kmountpoint.h     [License: LGPL (v2)]
A  +4    -0    tier3/kservice/src/kbuildsycoca/vfolder_menu.cpp     [License: LGPL (v2)]
A  +1    -1    tier3/kservice/src/sycoca/ksycoca.cpp     [License: LGPL (v2)]
A  +1    -1    tier4/apidox/src/doxygen.sh
A  +1    -1    tier4/kde4support/src/kdecore/kcmdlineargs.h     [License: LGPL (v2)]
A  +25   -36   tier4/kde4support/src/kdecore/kstandarddirs.cpp     [License: LGPL (v2)]
R  +1    -1    tier4/khtml/src/java/kjavaappletviewer.desktop
R  +1    -1    tier4/khtml/src/khtml.desktop
A  +1    -1    tier4/khtml/src/khtml_part.cpp     [License: LGPL (v2+)]
R  +2    -2    tier4/khtml/src/khtmlimage.desktop
R  +1    -1    tier4/khtml/src/kmultipart/kmultipart.desktop

http://commits.kde.org/kdelibs/0cf81531c4d70b89bafd65a6ffc3522da6269865