14 files changed, 153 insertions, 203 deletions

diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 910018770d41..1be6027490ee 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -80,7 +80,7 @@ KTP_VERSION?=		0.6.1
 KTP_BRANCH?=		stable
 CALLIGRA_VERSION?=	2.7.5
 CALLIGRA_BRANCH?=	stable
-KDEVELOP_VERSION?=	4.5.2
+KDEVELOP_VERSION?=	4.6.0
 KDEVELOP_BRANCH?=	stable
 
 #
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index 91ffb8d5a46b..98a9d41c4925 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -6,47 +6,31 @@ DISTVERSION=	${KDEVELOP_VERSION}
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plugin extensible IDE for KDE
 
-LIB_DEPENDS=	kdevplatforminterfaces:${PORTSDIR}/devel/kdevplatform
+LIB_DEPENDS=	libkdevplatforminterfaces.so:${PORTSDIR}/devel/kdevplatform
 RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
 
-LATEST_LINK=	${PORTNAME}-kde4
-
-USE_KDE4=	kdehier kdelibs kdeprefix sharedmime workspace automoc4
+USE_KDE4=	kdehier kdelibs kdeprefix workspace automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
 USE_XZ=		yes
 USES=		cmake gmake shared-mime-info
 
 OPTIONS_DEFINE=	OKTETA PHP NLS
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFAULT=	OKTETA PHP
+OPTIONS_SUB=	yes
 
 OKTETA_DESC=	Hex editing support via Okteta
+OKTETA_LIB_DEPENDS=	libokteta1core.so:${PORTSDIR}/devel/kdesdk4
+
+PHP_DESC=	PHP support for KDevelop
+PHP_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphplanguagesupport.so:${PORTSDIR}/devel/kdevelop-php
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOKTETA}
-LIB_DEPENDS+=	okteta1core:${PORTSDIR}/devel/kdesdk4
-PLIST_SUB+=	OKTETA=""
-.else
-CMAKE_ARGS+=	-DWITH_LibOkteta:BOOL=FALSE
-PLIST_SUB+=	OKTETA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPHP}
-RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/kdevphplanguagesupport.so:${PORTSDIR}/devel/kdevelop-php
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DBUILD_po:BOOL=FALSE
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+NLS_CMAKE_OFF=	-DBUILD_po:BOOL=FALSE
 
 post-patch:
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
diff --git a/devel/kdevelop-kde4/distinfo b/devel/kdevelop-kde4/distinfo
index bebd7da30ee4..30313c50dbb5 100644
--- a/devel/kdevelop-kde4/distinfo
+++ b/devel/kdevelop-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdevelop-4.5.2.tar.xz) = d157224a81c886cbe32d25600a29042a6fec1e0c535202dc85748cd15877fe30
-SIZE (KDE/kdevelop-4.5.2.tar.xz) = 4901660
+SHA256 (KDE/kdevelop/4.6.0/kdevelop-4.6.0.tar.xz) = 1ee9e7b8c46f575dd29d920cfd6284130f2e738a2e1f52dfd97b075fab2e4c73
+SIZE (KDE/kdevelop/4.6.0/kdevelop-4.6.0.tar.xz) = 4867960
diff --git a/devel/kdevelop-kde4/pkg-plist b/devel/kdevelop-kde4/pkg-plist
index d90e62410e52..ae63dd8e2345 100644
--- a/devel/kdevelop-kde4/pkg-plist
+++ b/devel/kdevelop-kde4/pkg-plist
@@ -3,6 +3,7 @@ bin/kdevelop!
 include/kdevelop/make/imakebuilder.h
 lib/kde4/kcm_kdev_cmakebuilder.so
 lib/kde4/kcm_kdev_makebuilder.so
+lib/kde4/kcm_kdev_ninjabuilder.so
 lib/kde4/kcm_kdevcmake_settings.so
 lib/kde4/kcm_kdevcustombuildsystem.so
 lib/kde4/kdevastyle.so
@@ -15,9 +16,11 @@ lib/kde4/kdevcustommakemanager.so
 lib/kde4/kdevcustomscript.so
 lib/kde4/kdevexecuteplasmoid.so
 lib/kde4/kdevgdb.so
+lib/kde4/kdevghprovider.so
 lib/kde4/kdevkdeprovider.so
 lib/kde4/kdevmakebuilder.so
 lib/kde4/kdevmanpage.so
+lib/kde4/kdevninja.so
 %%OKTETA%%lib/kde4/kdevokteta.so
 lib/kde4/kdevqthelp.so
 lib/kde4/kdevqthelp_config.so
@@ -34,12 +37,11 @@ share/apps/kdevappwizard/templates/cmake_plaincpp.tar.bz2
 share/apps/kdevappwizard/templates/cmake_qt4core.tar.bz2
 share/apps/kdevappwizard/templates/cmake_qt4core_qtest.tar.bz2
 share/apps/kdevappwizard/templates/cmake_qt4gui.tar.bz2
-share/apps/kdevcmakebuilder/data.kdev4
-share/apps/kdevcmakemanager/data.kdev4
 share/apps/kdevcodegen/templates/class_declaration_cpp.txt
 share/apps/kdevcodegen/templates/cpp_header.h
 share/apps/kdevcodegen/templates/cpp_header_onlyfunctions.h
 share/apps/kdevcodegen/templates/cpp_implementation.cpp
+share/apps/kdevcodegen/templates/license_header_cpp.txt
 share/apps/kdevcodegen/templates/method_declaration_cpp.txt
 share/apps/kdevcodegen/templates/method_definition_cpp.txt
 share/apps/kdevcppsupport/kdevcppsupport.rc
@@ -148,6 +150,7 @@ share/apps/kdevelop/pics/slot.png
 share/apps/kdevelop/pics/struct.png
 share/apps/kdevelop/pics/typedef.png
 share/apps/kdevelop/pics/union.png
+share/apps/kdevelop/splash.qml
 share/apps/kdevfiletemplates/templates/c_gobject.tar.bz2
 share/apps/kdevfiletemplates/templates/c_gobject_private.tar.bz2
 share/apps/kdevfiletemplates/templates/c_gobject_properties.tar.bz2
@@ -165,8 +168,8 @@ share/apps/kdevfiletemplates/templates/qt_shared.tar.bz2
 share/apps/kdevfiletemplates/templates/qt_widget.tar.bz2
 share/apps/kdevgdb/kdevgdbui.rc
 share/apps/kdevgdb/printers/gdbinit
+share/apps/kdevgdb/printers/helper.py
 share/apps/kdevgdb/printers/kde4.py
-share/apps/kdevgdb/printers/libstdcxx.py
 share/apps/kdevgdb/printers/qt4.py
 %%OKTETA%%share/apps/kdevokteta/kdevokteta.rc
 share/apps/plasma/plasmoids/kdevelopsessions/contents/ui/kdevelopsessions.qml
@@ -228,13 +231,19 @@ share/doc/HTML/en/kdevelop/kdevelop4_noworkingset.png
 share/doc/HTML/en/kdevelop/kdevelop4_sessionsprojectsworkingsets.png
 share/icons/hicolor/128x128/apps/cmake.png
 share/icons/hicolor/16x16/apps/cmake.png
+share/icons/hicolor/16x16/apps/github-forked.png
+share/icons/hicolor/16x16/apps/github-private.png
+share/icons/hicolor/16x16/apps/github-repo.png
 share/icons/hicolor/16x16/apps/kdevelop.png
+share/icons/hicolor/16x16/apps/kdevgh.png
 share/icons/hicolor/32x32/apps/cmake.png
 share/icons/hicolor/32x32/apps/kdevelop.png
+share/icons/hicolor/32x32/apps/kdevgh.png
 share/icons/hicolor/48x48/apps/kdevelop.png
 share/icons/hicolor/64x64/apps/cmake.png
 share/kde4/services/kcm_kdev_cmakebuilder.desktop
 share/kde4/services/kcm_kdev_makebuilder.desktop
+share/kde4/services/kcm_kdev_ninjabuilder.desktop
 share/kde4/services/kcm_kdevcmake_settings.desktop
 share/kde4/services/kcm_kdevcustombuildsystem.desktop
 share/kde4/services/kdevastyle.desktop
@@ -248,9 +257,11 @@ share/kde4/services/kdevcustomscript.desktop
 share/kde4/services/kdevelopsessions.desktop
 share/kde4/services/kdevexecuteplasmoid.desktop
 share/kde4/services/kdevgdb.desktop
+share/kde4/services/kdevghprovider.desktop
 share/kde4/services/kdevkdeprovider.desktop
 share/kde4/services/kdevmakebuilder.desktop
 share/kde4/services/kdevmanpage.desktop
+share/kde4/services/kdevninja.desktop
 %%OKTETA%%share/kde4/services/kdevokteta.desktop
 share/kde4/services/kdevqthelp.desktop
 share/kde4/services/kdevqthelp_config.desktop
@@ -265,9 +276,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -281,9 +294,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -291,13 +306,21 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevcpp.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevcustombuildsystem.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevcustommake.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevelop.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevghprovider.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevmakebuilder.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevqthelp.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/plasma_runner_kdevelopsessions.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevcpp.mo
@@ -307,9 +330,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/da/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/da/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -323,9 +348,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/de/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/de/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/de/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/de/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -365,9 +392,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/es/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/es/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/es/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/es/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -398,6 +427,7 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -411,9 +441,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -427,9 +459,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevelop.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -459,9 +493,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/it/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/it/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/it/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/it/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -475,9 +511,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -520,9 +558,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -552,9 +592,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -568,9 +610,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -600,9 +644,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -616,9 +662,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -632,27 +680,16 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/plasma_runner_kdevelopsessions.mo
 %%NLS%%share/locale/th/LC_MESSAGES/kdevcustommake.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevcmake.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevcmakebuilder.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevcpp.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevcustombuildsystem.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevcustommake.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevelop.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevformatters.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevgdb.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevmakebuilder.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevmanpage.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevokteta.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdevqthelp.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/plasma_runner_kdevelopsessions.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevcmake.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevcmakebuilder.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevcpp.mo
@@ -662,9 +699,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -692,9 +731,11 @@ share/kde4/services/plasma-dataengine-kdevelopsessions.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevexecuteplasmoid.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevformatters.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevgdb.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevghprovider.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevkdeprovider.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevmakebuilder.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevmanpage.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevninja.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevokteta.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevqthelp.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/plasma_applet_kdevelopsessions.mo
@@ -708,6 +749,7 @@ share/mime/packages/kdevelop.xml
 @dirrm share/apps/kdevgdb/printers
 @dirrm share/apps/kdevgdb
 @dirrm share/apps/kdevfiletemplates/templates
+@dirrm share/apps/kdevfiletemplates
 @dirrm share/apps/kdevelop/pics
 @dirrm share/apps/kdevelop/icons/hicolor/32x32/mimetypes
 @dirrm share/apps/kdevelop/icons/hicolor/32x32/actions
@@ -721,8 +763,8 @@ share/mime/packages/kdevelop.xml
 @dirrm share/apps/kdevelop
 @dirrm share/apps/kdevcustommakemanager
 @dirrm share/apps/kdevcppsupport
-@dirrm share/apps/kdevcmakemanager
-@dirrm share/apps/kdevcmakebuilder
+@dirrm share/apps/kdevcodegen/templates
+@dirrm share/apps/kdevcodegen
 @dirrm share/apps/kdevappwizard/templates
 @dirrmtry share/apps/kdevappwizard
 @dirrm include/kdevelop/make
diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
index 9ae22875e21f..e0aef1c36280 100644
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@@ -1,14 +1,12 @@
 # Created by: Douglas Carmichael <dcarmich@dcarmichael.net>
 # $FreeBSD$
 
-PORTNAME=	kdevelop
+PORTNAME=	kdevelop-pg-qt
 PORTVERSION=	1.0.0
 PORTREVISION=	3
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/src
-PKGNAMESUFFIX=	-pg-qt
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index cf3ef4e0d5aa..a1717187ca69 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -5,26 +5,22 @@ PORTVERSION=	${KDEVELOP_VERSION:S/4./1./}
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	PHP documentation for KDevelop
 
-LIB_DEPENDS=	kdevplatforminterfaces:${PORTSDIR}/devel/kdevplatform
+LIB_DEPENDS=	libkdevplatforminterfaces.so:${PORTSDIR}/devel/kdevplatform
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 USES=		cmake
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+NLS_CMAKE_OFF=	-DBUILD_po:BOOL=FALSE
 
 .include <bsd.port.mk>
diff --git a/devel/kdevelop-php-docs/distinfo b/devel/kdevelop-php-docs/distinfo
index ef531bec5639..6ca5b533b0b8 100644
--- a/devel/kdevelop-php-docs/distinfo
+++ b/devel/kdevelop-php-docs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdevelop-php-docs-1.5.2.tar.xz) = 1b8dbecbb0ad74910754b839fc29621aaf942792f9f30fd32521598d28711425
-SIZE (KDE/kdevelop-php-docs-1.5.2.tar.xz) = 32368
+SHA256 (KDE/kdevelop/4.6.0/kdevelop-php-docs-1.6.0.tar.xz) = fd3958cbf667f795bb42a6e6ee2e9779b6b3f4cca3dde0781b5d6972f609e2df
+SIZE (KDE/kdevelop/4.6.0/kdevelop-php-docs-1.6.0.tar.xz) = 32580
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index ba17cb3331c2..cf846b3f44e9 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	${KDEVELOP_VERSION:S/4./1./}
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	PHP support for KDevelop
@@ -20,22 +20,13 @@ USES=		cmake gmake
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	PHPDOCS NLS
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFAULT=	PHPDOCS
+OPTIONS_SUB=	yes
 
 PHPDOCS_DESC=	Integrate with PHP.net documentation
+PHPDOCS_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphpdocs.so:${PORTSDIR}/devel/kdevelop-php-docs
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPHPDOCS}
-RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/kdevphpdocs.so:${PORTSDIR}/devel/kdevelop-php-docs
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+NLS_CMAKE_OFF=	-DBUILD_po:BOOL=Off
 
 .include <bsd.port.mk>
diff --git a/devel/kdevelop-php/distinfo b/devel/kdevelop-php/distinfo
index f690195d6b80..345ae0b79128 100644
--- a/devel/kdevelop-php/distinfo
+++ b/devel/kdevelop-php/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdevelop-php-1.5.2.tar.xz) = 2ee676dd81af01a36c042248300ef1c5d27dfa1d5e29aa2e03749db8f4808f2d
-SIZE (KDE/kdevelop-php-1.5.2.tar.xz) = 649044
+SHA256 (KDE/kdevelop/4.6.0/kdevelop-php-1.6.0.tar.xz) = 5f128ccffbe210e24b438411e8e068b622791913310e5796f59350af20c2ff23
+SIZE (KDE/kdevelop/4.6.0/kdevelop-php-1.6.0.tar.xz) = 649816
diff --git a/devel/kdevelop-php/pkg-plist b/devel/kdevelop-php/pkg-plist
index 9b73274f0fab..21ad522b8ebe 100644
--- a/devel/kdevelop-php/pkg-plist
+++ b/devel/kdevelop-php/pkg-plist
@@ -20,7 +20,6 @@ share/kde4/services/kdevphpunitprovider.desktop
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevphp.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevphp.mo
@@ -33,11 +32,8 @@ share/kde4/services/kdevphpunitprovider.desktop
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevphp.mo
-%%NLS%%share/locale/th/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevphp.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevphp.mo
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
 @dirrm share/apps/kdevphpsupport
 @dirrmtry share/apps/kdevappwizard/templates
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 1aa30a4028d7..71b8c042a3c1 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	${KDEVELOP_VERSION:S/4./1./}
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Set of libraries for KDE IDE-like programs
@@ -26,14 +26,10 @@ USE_LDCONFIG=	yes
 PLIST_SUB+=	SHLIB_VER=7.0.0 \
 		SHLIB_SHVER=7
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+NLS_CMAKE_OFF=	-DBUILD_po:BOOL=Off
 
 .include <bsd.port.mk>
diff --git a/devel/kdevplatform/distinfo b/devel/kdevplatform/distinfo
index d042e4e87bb5..bb973f6588dd 100644
--- a/devel/kdevplatform/distinfo
+++ b/devel/kdevplatform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdevplatform-1.5.2.tar.xz) = a12656cfe137172db5feed9795b4f40b7fb42a93b6caf90838e5f9c205ee186a
-SIZE (KDE/kdevplatform-1.5.2.tar.xz) = 1895448
+SHA256 (KDE/kdevelop/4.6.0/kdevplatform-1.6.0.tar.xz) = cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80
+SIZE (KDE/kdevelop/4.6.0/kdevplatform-1.6.0.tar.xz) = 1889840
diff --git a/devel/kdevplatform/files/patch-util_google_sparsehash_sparsehashconfig.h b/devel/kdevplatform/files/patch-util_google_sparsehash_sparsehashconfig.h
new file mode 100644
index 000000000000..f3395ba246b7
--- /dev/null
+++ b/devel/kdevplatform/files/patch-util_google_sparsehash_sparsehashconfig.h
@@ -0,0 +1,11 @@
+--- util/google/sparsehash/sparseconfig.h.orig	2013-12-16 12:42:46.000000000 +0100
++++ util/google/sparsehash/sparseconfig.h	2013-12-16 12:43:09.000000000 +0100
+@@ -5,7 +5,7 @@
+ #define GOOGLE_NAMESPACE ::google
+ 
+ /* the location of <hash_fun.h>/<stl_hash_fun.h> */
+-#define HASH_FUN_H "hash_fun.h"
++#define HASH_FUN_H <ext/hash_fun.h>
+ 
+ /* the location of <hash_map> */
+ #define HASH_MAP_H <ext/hash_map>
diff --git a/devel/kdevplatform/pkg-plist b/devel/kdevplatform/pkg-plist
index 3df32d51d9f3..0b335843e3c4 100644
--- a/devel/kdevplatform/pkg-plist
+++ b/devel/kdevplatform/pkg-plist
@@ -1,5 +1,5 @@
 bin/kdev_dbus_socket_transformer
-bin/kdev_format_source.sh
+bin/kdev_format_source
 bin/kdevplatform_shell_environment.sh
 include/kdevplatform/debugger/breakpoint/breakpoint.h
 include/kdevplatform/debugger/breakpoint/breakpointdetails.h
@@ -49,12 +49,14 @@ include/kdevplatform/interfaces/ipatchexporter.h
 include/kdevplatform/interfaces/ipatchsource.h
 include/kdevplatform/interfaces/iplugin.h
 include/kdevplatform/interfaces/iplugincontroller.h
+include/kdevplatform/interfaces/ipluginversion.h
 include/kdevplatform/interfaces/iproject.h
 include/kdevplatform/interfaces/iprojectcontroller.h
 include/kdevplatform/interfaces/iprojectprovider.h
 include/kdevplatform/interfaces/iruncontroller.h
 include/kdevplatform/interfaces/iselectioncontroller.h
 include/kdevplatform/interfaces/isession.h
+include/kdevplatform/interfaces/isessionlock.h
 include/kdevplatform/interfaces/isourceformatter.h
 include/kdevplatform/interfaces/isourceformattercontroller.h
 include/kdevplatform/interfaces/istatus.h
@@ -147,7 +149,11 @@ include/kdevplatform/language/duchain/parsingenvironment.h
 include/kdevplatform/language/duchain/persistentsetmap.h
 include/kdevplatform/language/duchain/persistentsymboltable.h
 include/kdevplatform/language/duchain/referencecounting.h
+include/kdevplatform/language/duchain/repositories/abstractitemrepository.h
 include/kdevplatform/language/duchain/repositories/itemrepository.h
+include/kdevplatform/language/duchain/repositories/itemrepositoryexampleitem.h
+include/kdevplatform/language/duchain/repositories/itemrepositoryregistry.h
+include/kdevplatform/language/duchain/repositories/repositorymanager.h
 include/kdevplatform/language/duchain/repositories/typerepository.h
 include/kdevplatform/language/duchain/safetycounter.h
 include/kdevplatform/language/duchain/specializationstore.h
@@ -204,6 +210,7 @@ include/kdevplatform/language/languageexport.h
 include/kdevplatform/language/util/basicsetrepository.h
 include/kdevplatform/language/util/debuglanguageparserhelper.h
 include/kdevplatform/language/util/includeitem.h
+include/kdevplatform/language/util/kdevhash.h
 include/kdevplatform/language/util/navigationtooltip.h
 include/kdevplatform/language/util/setrepository.h
 include/kdevplatform/openwith/iopenwith.h
@@ -223,9 +230,12 @@ include/kdevplatform/project/importprojectjob.h
 include/kdevplatform/project/interfaces/ibuildsystemmanager.h
 include/kdevplatform/project/interfaces/iprojectbuilder.h
 include/kdevplatform/project/interfaces/iprojectfilemanager.h
+include/kdevplatform/project/interfaces/iprojectfilter.h
+include/kdevplatform/project/interfaces/iprojectfilterprovider.h
 include/kdevplatform/project/projectbuildsetmodel.h
 include/kdevplatform/project/projectconfigskeleton.h
 include/kdevplatform/project/projectexport.h
+include/kdevplatform/project/projectfiltermanager.h
 include/kdevplatform/project/projectitemlineedit.h
 include/kdevplatform/project/projectkcmodule.h
 include/kdevplatform/project/projectmodel.h
@@ -245,6 +255,7 @@ include/kdevplatform/shell/runcontroller.h
 include/kdevplatform/shell/selectioncontroller.h
 include/kdevplatform/shell/session.h
 include/kdevplatform/shell/sessioncontroller.h
+include/kdevplatform/shell/sessionlock.h
 include/kdevplatform/shell/shellexport.h
 include/kdevplatform/shell/shellextension.h
 include/kdevplatform/shell/sourceformattercontroller.h
@@ -270,6 +281,8 @@ include/kdevplatform/tests/json/jsondeclarationtests.h
 include/kdevplatform/tests/json/jsonducontexttests.h
 include/kdevplatform/tests/json/jsontesthelpers.h
 include/kdevplatform/tests/json/jsontypetests.h
+include/kdevplatform/tests/json/kdevplatformjsontestsexport.h
+include/kdevplatform/tests/json/testsuite.cpp
 include/kdevplatform/tests/json/testsuite.h
 include/kdevplatform/tests/kdevplatformtestsexport.h
 include/kdevplatform/tests/kdevsignalspy.h
@@ -290,17 +303,6 @@ include/kdevplatform/util/executecompositejob.h
 include/kdevplatform/util/fileutils.h
 include/kdevplatform/util/focusedtreeview.h
 include/kdevplatform/util/formattinghelpers.h
-include/kdevplatform/util/google/dense_hash_map
-include/kdevplatform/util/google/dense_hash_set
-include/kdevplatform/util/google/hash_fun.h
-include/kdevplatform/util/google/sparse_hash_map
-include/kdevplatform/util/google/sparse_hash_set
-include/kdevplatform/util/google/sparsehash/densehashtable.h
-include/kdevplatform/util/google/sparsehash/sparseconfig.h
-include/kdevplatform/util/google/sparsehash/sparseconfig_windows.h
-include/kdevplatform/util/google/sparsehash/sparsehashtable.h
-include/kdevplatform/util/google/sparsetable
-include/kdevplatform/util/google/type_traits.h
 include/kdevplatform/util/kdevstringhandler.h
 include/kdevplatform/util/kdevvarlengtharray.h
 include/kdevplatform/util/ksharedobject.h
@@ -348,15 +350,13 @@ lib/cmake/kdevplatform/KDevPlatformConfigVersion.cmake
 lib/cmake/kdevplatform/KDevPlatformMacros.cmake
 lib/cmake/kdevplatform/KDevPlatformTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/kdevplatform/KDevPlatformTargets.cmake
-lib/kde4/imports/org/kde/kdevplatform/libkdevelopdashboarddeclarativeplugin.so
-lib/kde4/imports/org/kde/kdevplatform/qmldir
 lib/kde4/kcm_kdev_bgsettings.so
 lib/kde4/kcm_kdev_ccsettings.so
 lib/kde4/kcm_kdev_envsettings.so
-lib/kde4/kcm_kdev_genericprojectmanagersettings.so
 lib/kde4/kcm_kdev_pluginsettings.so
 lib/kde4/kcm_kdev_projectsettings.so
 lib/kde4/kcm_kdev_uisettings.so
+lib/kde4/kcm_kdevprojectfilter.so
 lib/kde4/kcm_kdevsourceformattersettings.so
 lib/kde4/kdevappwizard.so
 lib/kde4/kdevclassbrowser.so
@@ -378,7 +378,7 @@ lib/kde4/kdevopenwith.so
 lib/kde4/kdevpastebin.so
 lib/kde4/kdevpatchreview.so
 lib/kde4/kdevproblemreporter.so
-lib/kde4/kdevprojectdashboard.so
+lib/kde4/kdevprojectfilter.so
 lib/kde4/kdevprojectmanagerview.so
 lib/kde4/kdevquickopen.so
 lib/kde4/kdevreviewboard.so
@@ -389,7 +389,6 @@ lib/kde4/kdevswitchtobuddy.so
 lib/kde4/kdevtemplatemanager_config.so
 lib/kde4/kdevtestview.so
 lib/kde4/kdevvcschangesviewplugin.so
-lib/kde4/plasma_kdev_projectfileelement.so
 lib/kde4/plugins/grantlee/0.3/kdev_filters.so
 lib/libkdevplatformdebugger.so.%%SHLIB_VER%%
 lib/libkdevplatformdebugger.so
@@ -437,6 +436,7 @@ share/apps/kdevcodegen/licenses/GPL v2+ (KDE)
 share/apps/kdevcodegen/licenses/GPL v3
 share/apps/kdevcodegen/licenses/LGPL v2
 share/apps/kdevcodegen/licenses/LGPL v2+ (KDE)
+share/apps/kdevcodegen/licenses/LGPL v3
 share/apps/kdevcodegen/licenses/MIT X11
 share/apps/kdevcodegen/licenses/Mozilla v1.1
 share/apps/kdevcodegen/templates/arguments_names.txt
@@ -467,8 +467,6 @@ share/apps/kdevsnippet/kdevsnippet.rc
 share/apps/kdevsourceformatter/kdevsourceformatter.rc
 share/apps/kdevstandardoutputview/kdevstandardoutputview.rc
 share/apps/kdevtestview/kdevtestview.rc
-share/apps/plasma/plasmoids/org.kdevelop.branches/contents/qml/main.qml
-share/apps/plasma/plasmoids/org.kdevelop.branches/metadata.desktop
 share/config/kdevappwizard.knsrc
 share/config/kdevfiletemplates.knsrc
 share/icons/hicolor/128x128/apps/reviewboard.png
@@ -484,12 +482,11 @@ share/icons/hicolor/64x64/apps/subversion.png
 share/kde4/services/kcm_kdev_bgsettings.desktop
 share/kde4/services/kcm_kdev_ccsettings.desktop
 share/kde4/services/kcm_kdev_envsettings.desktop
-share/kde4/services/kcm_kdev_genericprojectmanagersettings.desktop
 share/kde4/services/kcm_kdev_pluginsettings.desktop
 share/kde4/services/kcm_kdev_projectsettings.desktop
 share/kde4/services/kcm_kdev_uisettings.desktop
+share/kde4/services/kcm_kdevprojectfilter.desktop
 share/kde4/services/kcm_kdevsourceformattersettings.desktop
-share/kde4/services/kdev-dash-projectfileelement.desktop
 share/kde4/services/kdevappwizard.desktop
 share/kde4/services/kdevclassbrowser.desktop
 share/kde4/services/kdevcodeutils.desktop
@@ -497,7 +494,6 @@ share/kde4/services/kdevcontextbrowser.desktop
 share/kde4/services/kdevcvs.desktop
 share/kde4/services/kdevdocumentswitcher.desktop
 share/kde4/services/kdevdocumentview.desktop
-share/kde4/services/kdevelop-dashboard-branches.desktop
 share/kde4/services/kdevexecute.desktop
 share/kde4/services/kdevexecutescript.desktop
 share/kde4/services/kdevexternalscript.desktop
@@ -511,7 +507,7 @@ share/kde4/services/kdevopenwith.desktop
 share/kde4/services/kdevpastebin.desktop
 share/kde4/services/kdevpatchreview.desktop
 share/kde4/services/kdevproblemreporter.desktop
-share/kde4/services/kdevprojectdashboard.desktop
+share/kde4/services/kdevprojectfilter.desktop
 share/kde4/services/kdevprojectmanagerview.desktop
 share/kde4/services/kdevquickopen.desktop
 share/kde4/services/kdevreviewboard.desktop
@@ -544,7 +540,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/kdevreviewboard.mo
@@ -576,7 +572,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdevreviewboard.mo
@@ -598,6 +594,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevexecutescript.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevexternalscript.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevfilemanager.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevfiletemplates.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevgenericprojectmanager.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevgit.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevgrepview.mo
@@ -607,12 +604,17 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevproblemreporter.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevreviewboard.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevsnippet.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevstandardoutputview.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevsubversion.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevswitchtobuddy.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevtemplates_config.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevtestview.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdevvcsprojectintegration.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevclassbrowser.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevcodeutils.mo
@@ -634,7 +636,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/da/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/da/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdevreviewboard.mo
@@ -666,7 +668,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/de/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/de/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/de/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdevreviewboard.mo
@@ -697,7 +699,6 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/el/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/el/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/el/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/el/LC_MESSAGES/kdevprojectdashboard.mo
 %%NLS%%share/locale/el/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/el/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/el/LC_MESSAGES/kdevreviewboard.mo
@@ -708,32 +709,6 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/el/LC_MESSAGES/kdevtemplates_config.mo
 %%NLS%%share/locale/el/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/el/LC_MESSAGES/kdevvcsprojectintegration.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevappwizard.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevclassbrowser.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevcodeutils.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevcontextbrowser.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevcvs.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevdocumentswitcher.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevdocumentview.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevexecute.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevexecutescript.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevexternalscript.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevfilemanager.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevgenericprojectmanager.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevgit.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevgrepview.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevkonsole.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevopenwith.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevpastebin.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevpatchreview.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevplatform.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevprojectmanagerview.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevquickopen.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevreviewboard.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevsnippet.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevstandardoutputview.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdevsubversion.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevclassbrowser.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevcodeutils.mo
@@ -755,7 +730,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/es/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/es/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/es/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdevreviewboard.mo
@@ -786,7 +761,6 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/et/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/et/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/et/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/et/LC_MESSAGES/kdevprojectdashboard.mo
 %%NLS%%share/locale/et/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/et/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/et/LC_MESSAGES/kdevreviewboard.mo
@@ -816,7 +790,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/kdevreviewboard.mo
@@ -848,7 +822,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdevreviewboard.mo
@@ -880,7 +854,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/kdevreviewboard.mo
@@ -912,7 +886,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/it/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/it/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/it/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdevreviewboard.mo
@@ -944,7 +918,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kdevreviewboard.mo
@@ -975,7 +949,6 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/kdevprojectdashboard.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevreviewboard.mo
@@ -983,34 +956,6 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevstandardoutputview.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevsubversion.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdevvcsprojectintegration.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevappwizard.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevclassbrowser.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevcodeutils.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevcontextbrowser.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevcvs.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevdocumentswitcher.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevdocumentview.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevexecute.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevexecutescript.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevexternalscript.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevfilemanager.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevgenericprojectmanager.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevgit.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevgrepview.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevkonsole.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevopenwith.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevpastebin.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevpatchreview.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevplatform.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevprojectdashboard.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevprojectmanagerview.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevquickopen.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevreviewboard.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevsnippet.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevstandardoutputview.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevsubversion.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdevvcsprojectintegration.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevappwizard.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevclassbrowser.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevcodeutils.mo
@@ -1032,7 +977,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdevreviewboard.mo
@@ -1064,7 +1009,6 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/kdevprojectdashboard.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdevreviewboard.mo
@@ -1096,7 +1040,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdevreviewboard.mo
@@ -1128,7 +1072,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdevreviewboard.mo
@@ -1160,7 +1104,6 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/kdevprojectdashboard.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdevreviewboard.mo
@@ -1192,7 +1135,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdevreviewboard.mo
@@ -1224,7 +1167,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdevreviewboard.mo
@@ -1256,7 +1199,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/kdevreviewboard.mo
@@ -1292,7 +1235,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kdevreviewboard.mo
@@ -1323,7 +1266,6 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevprojectdashboard.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/kdevreviewboard.mo
@@ -1353,7 +1295,7 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevpatchreview.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevplatform.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevproblemreporter.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevprojectdashboard.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevprojectfilter.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevprojectmanagerview.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevquickopen.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevreviewboard.mo
@@ -1364,9 +1306,6 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevtemplates_config.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevtestview.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdevvcsprojectintegration.mo
-@dirrm share/apps/plasma/plasmoids/org.kdevelop.branches/contents/qml
-@dirrm share/apps/plasma/plasmoids/org.kdevelop.branches/contents
-@dirrm share/apps/plasma/plasmoids/org.kdevelop.branches
 @dirrm share/apps/kdevtestview
 @dirrm share/apps/kdevstandardoutputview
 @dirrm share/apps/kdevsourceformatter
@@ -1392,15 +1331,12 @@ share/kde4/servicetypes/kdevelopplugin.desktop
 @dirrmtry share/apps/kdevcodegen
 @dirrm share/apps/kdevclassbrowser
 @dirrmtry share/apps/kdevappwizard
-@dirrm lib/kde4/imports/org/kde/kdevplatform
 @dirrm lib/cmake/kdevplatform
 @dirrm include/kdevplatform/vcs/widgets
 @dirrm include/kdevplatform/vcs/models
 @dirrm include/kdevplatform/vcs/interfaces
 @dirrm include/kdevplatform/vcs/dvcs
 @dirrm include/kdevplatform/vcs
-@dirrm include/kdevplatform/util/google/sparsehash
-@dirrm include/kdevplatform/util/google
 @dirrm include/kdevplatform/util
 @dirrm include/kdevplatform/tests/json
 @dirrm include/kdevplatform/tests