diff --git a/CMakeLists.txt b/CMakeLists.txt
index 079238fa8..196042f1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,139 +1,139 @@
 # kdevplatform version
 set(KDEVPLATFORM_VERSION_MAJOR 1)
-set(KDEVPLATFORM_VERSION_MINOR 6)
-set(KDEVPLATFORM_VERSION_PATCH 90)
+set(KDEVPLATFORM_VERSION_MINOR 7)
+set(KDEVPLATFORM_VERSION_PATCH 0)
 
 # plugin versions listed in the .desktop files
 set(KDEV_PLUGIN_VERSION 17)
 
 # library version / SO version
 set(KDEVPLATFORM_LIB_VERSION 8.0.0)
 set(KDEVPLATFORM_LIB_SOVERSION 8)
 
 ################################################################################
 
 cmake_minimum_required(VERSION 2.8.9)
 project(KDevPlatform)
 
 set(CMAKE_MODULE_PATH ${KDevPlatform_SOURCE_DIR}/cmake/modules)
 
 set(KDE_MIN_VERSION "4.7.0")
 find_package(KDE4 4.7.0 REQUIRED)
 
 find_package(Grantlee 0.1.7)
 find_package(QJSON)
 macro_log_feature( Grantlee_FOUND "Grantlee" "Grantlee templating library, needed for file templates" "http://www.grantlee.org/" TRUE "0.1.7")
 macro_log_feature( QJSON_FOUND "QJson" "QJson support for Uploading Patches to reviewboard" "http://qjson.sourceforge.net/" FALSE "0.7.0" "The qjson library is needed to enable uploading patches to reviewboard" )
 
 # QJSON <=0.7.1 provides variables with lower case prefix, see bug 331426
 if (QJSON_VERSION VERSION_LESS "0.7.2")
     set(QJSON_LIBRARIES   ${qjson_LIBRARIES})
     set(QJSON_INCLUDE_DIR ${qjson_INCLUDE_DIR})
 endif()
 
 include (KDE4Defaults)
 include (MacroWriteBasicCMakeVersionFile)
 include (MacroLibrary)
 
 # Make sure that we're having RPATH on our installed libs, else using kdevelop
 # from prefixes like $HOME/kdevelop breaks
 # Code taken from FindKDE4Internal.cmake for KDE 4.5
 list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}"
   _isSystemLibDir)
 if("${_isSystemLibDir}" STREQUAL "-1")
   set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
 endif("${_isSystemLibDir}" STREQUAL "-1")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS -DQURL_NO_CAST_FROM_QSTRING)
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 endif()
 
 # Turn off missing-field-initializers warning for GCC to avoid noise from false positives with empty {}
 # See discussion: http://mail.kde.org/pipermail/kdevelop-devel/2014-February/046910.html
 if (CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     # TODO: kf5 remove
     # in Qt 4, clang support is lacking...
     add_definitions("-DQ_COMPILER_INITIALIZER_LISTS=1")
 endif()
 
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config-kdevplatform.h.cmake
                 ${CMAKE_CURRENT_BINARY_DIR}/config-kdevplatform.h )
 
 include_directories(${KDevPlatform_SOURCE_DIR} ${KDevPlatform_BINARY_DIR} ${KDE4_INCLUDES})
 include_directories(${Grantlee_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util/)
 
 # Now set the usual KDEVPLATFORM_XXX_LIBRARIES variable so we can more easily move plugins around
 set(KDEVPLATFORM_SUBLIME_LIBRARIES sublime)
 set(KDEVPLATFORM_INTERFACES_LIBRARIES kdevplatforminterfaces)
 set(KDEVPLATFORM_LANGUAGE_LIBRARIES kdevplatformlanguage)
 set(KDEVPLATFORM_PROJECT_LIBRARIES kdevplatformproject)
 set(KDEVPLATFORM_UTIL_LIBRARIES kdevplatformutil)
 set(KDEVPLATFORM_OUTPUTVIEW_LIBRARIES kdevplatformoutputview)
 set(KDEVPLATFORM_VCS_LIBRARIES kdevplatformvcs)
 set(KDEVPLATFORM_SHELL_LIBRARIES kdevplatformshell)
 set(KDEVPLATFORM_TESTS_LIBRARIES kdevplatformtests)
 set(KDEVPLATFORM_JSONTESTS_LIBRARIES kdevplatformjsontests)
 set(KDEVPLATFORM_DEBUGGER_LIBRARIES kdevplatformdebugger)
 set(KDEVPLATFORM_DOCUMENTATION_LIBRARIES kdevplatformdocumentation)
 
 add_subdirectory(sublime)
 add_subdirectory(interfaces)
 add_subdirectory(project)
 add_subdirectory(language)
 add_subdirectory(shell)
 add_subdirectory(util)
 add_subdirectory(outputview)
 add_subdirectory(vcs)
 add_subdirectory(pics)
 #macro_optional_add_subdirectory(doc)
 add_subdirectory(debugger)
 add_subdirectory(documentation)
 if (Grantlee_FOUND)
 add_subdirectory(template)
 endif()
 add_subdirectory(tests)
 
 add_subdirectory(plugins)
 
 macro_write_basic_cmake_version_file( ${KDevPlatform_BINARY_DIR}/KDevPlatformConfigVersion.cmake ${KDEVPLATFORM_VERSION_MAJOR} ${KDEVPLATFORM_VERSION_MINOR} ${KDEVPLATFORM_VERSION_PATCH} )
 configure_file( "${KDevPlatform_SOURCE_DIR}/KDevPlatformConfig.cmake.in" "${KDevPlatform_BINARY_DIR}/KDevPlatformConfig.cmake" @ONLY )
 configure_file( "${KDevPlatform_SOURCE_DIR}/kdevplatformversion.h.cmake" "${KDevPlatform_BINARY_DIR}/kdevplatformversion.h" @ONLY )
 
 if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
     set(_kdevplatform_CONFIG_DEST "${LIB_INSTALL_DIR}/cmake/kdevplatform")
 else(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
     set(_kdevplatform_CONFIG_DEST "${LIB_INSTALL_DIR}/kdevplatform")
 endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
 
 install( FILES
         "${KDevPlatform_BINARY_DIR}/kdevplatformversion.h"
         DESTINATION "${INCLUDE_INSTALL_DIR}/kdevplatform" )
 install( FILES
         "${KDevPlatform_BINARY_DIR}/config-kdevplatform.h"
         DESTINATION "${INCLUDE_INSTALL_DIR}/kdevplatform" )
 install( FILES
         "${KDevPlatform_BINARY_DIR}/KDevPlatformConfig.cmake"
         "${KDevPlatform_BINARY_DIR}/KDevPlatformConfigVersion.cmake"
         DESTINATION "${_kdevplatform_CONFIG_DEST}" )
 install( EXPORT KDevPlatformTargets
          DESTINATION "${_kdevplatform_CONFIG_DEST}"
          NAMESPACE KDevPlatformImport__
          FILE KDevPlatformTargets.cmake )
 
 # Put this last, so it can use _kdevplatform_CONFIG_DEST
 add_subdirectory(cmake)
 
 include(CTest)
 
 # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
 # in the KDE build system, this is the same as CMAKE_BINARY_DIR.
 configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake)