midenok · midenok · Nov 13, 2017 · Nov 13, 2017 · Nov 14, 2017 · Nov 15, 2017
diff --git a/.reviewboardrc b/.reviewboardrc
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(KDevelop VERSION 5.2.0)
+project(KDevelop VERSION 5.2.1)
 
 # KDevelop SOVERSION
 # E.g. for KDevelop 5.2.0 => SOVERSION 52 (we only promise ABI compatibility between patch version updates)
@@ -31,6 +31,13 @@ include(CheckFunctionExists)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 
+if(POLICY CMP0071)
+  # CMake 3.10 generates warnings when projects combine AUTOMOC with qt5_wrap_ui() or qt5_add_resources()
+  # Avoid that by setting this policy (cf. https://bugreports.qt.io/browse/QTBUG-63442)
+  # Note: Once we depend on a Qt which has this fix (likely Qt 5.9.4+), remove this
+  cmake_policy(SET CMP0071 OLD)
+endif()
+
 set(QT_MIN_VERSION "5.5.0")
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Widgets Concurrent Quick QuickWidgets)
 if(BUILD_TESTING)
@@ -74,6 +81,14 @@ set_package_properties(KDevelop-PG-Qt PROPERTIES
 
 find_package(SharedMimeInfo REQUIRED)
 
+if(NOT CMAKE_VERSION VERSION_LESS "3.10.0" AND KF5_VERSION VERSION_LESS "5.42.0")
+  # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
+  # 3.10+ lets us provide more macro names that require automoc.
+  # KF5 >= 5.42 takes care itself of adding its macros in its cmake config files
+  list(APPEND CMAKE_AUTOMOC_MACRO_NAMES
+       "K_PLUGIN_FACTORY_WITH_JSON" "K_EXPORT_PLASMA_DATAENGINE_WITH_JSON" "K_EXPORT_PLASMA_RUNNER")
+endif()
+
 add_definitions(
     -DQT_DEPRECATED_WARNINGS
     -DQT_DISABLE_DEPRECATED_BEFORE=0x050500
@@ -160,6 +175,6 @@ configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCu
 install(FILES org.kde.kdevelop.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 
 # Make it possible to use the po files fetched by the fetch-translations step
-ki18n_install("${CMAKE_CURRENT_BINARY_DIR}/po")
+ki18n_install(po)
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/app/3rdparty/qtsingleapplication/CMakeLists.txt b/app/3rdparty/qtsingleapplication/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(qtsingleapplication_SRCS qtlocalpeer.cpp qtsingleapplication.cpp qtlockedfile.cpp)
+if(WIN32)
+    list(APPEND qtsingleapplication_SRCS qtlockedfile_win.cpp)
+else()
+    list(APPEND qtsingleapplication_SRCS qtlockedfile_unix.cpp)
+endif()
+add_library(qtsingleapplication STATIC ${qtsingleapplication_SRCS})
+target_link_libraries(qtsingleapplication Qt5::Core Qt5::Network Qt5::Widgets)
diff --git a/app/qtlocalpeer.cpp → ...party/qtsingleapplication/qtlocalpeer.cpp b/app/qtlocalpeer.cpp → ...party/qtsingleapplication/qtlocalpeer.cpp
diff --git a/app/qtlocalpeer.h → ...rdparty/qtsingleapplication/qtlocalpeer.h b/app/qtlocalpeer.h → ...rdparty/qtsingleapplication/qtlocalpeer.h
diff --git a/app/qtlockedfile.cpp → ...arty/qtsingleapplication/qtlockedfile.cpp b/app/qtlockedfile.cpp → ...arty/qtsingleapplication/qtlockedfile.cpp
diff --git a/app/qtlockedfile.h → ...dparty/qtsingleapplication/qtlockedfile.h b/app/qtlockedfile.h → ...dparty/qtsingleapplication/qtlockedfile.h
diff --git a/app/qtlockedfile_unix.cpp → ...qtsingleapplication/qtlockedfile_unix.cpp b/app/qtlockedfile_unix.cpp → ...qtsingleapplication/qtlockedfile_unix.cpp
diff --git a/app/qtlockedfile_win.cpp → .../qtsingleapplication/qtlockedfile_win.cpp b/app/qtlockedfile_win.cpp → .../qtsingleapplication/qtlockedfile_win.cpp
diff --git a/app/qtsingleapplication.cpp → ...singleapplication/qtsingleapplication.cpp b/app/qtsingleapplication.cpp → ...singleapplication/qtsingleapplication.cpp
diff --git a/app/qtsingleapplication.h → ...qtsingleapplication/qtsingleapplication.h b/app/qtsingleapplication.h → ...qtsingleapplication/qtsingleapplication.h
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -9,17 +9,7 @@ endif()
 
 option(KDEVELOP_SINGLE_APP "Use QtSingleApplication as KDevelop's base" OFF)
 
-set(singleapp_SRCS qtlocalpeer.cpp qtsingleapplication.cpp qtlockedfile.cpp)
-if(WIN32)
-    set(singleapp_SRCS ${singleapp_SRCS} qtlockedfile_win.cpp)
-else()
-    set(singleapp_SRCS ${singleapp_SRCS} qtlockedfile_unix.cpp)
-endif()
-
 set(kdevelop_SRCS  main.cpp kdevideextension.cpp)
-if(KDEVELOP_SINGLE_APP)
-    set(kdevelop_SRCS ${kdevelop_SRCS} ${singleapp_SRCS})
-endif()
 
 ecm_qt_declare_logging_category(kdevelop_SRCS
     HEADER debug.h
@@ -46,7 +36,6 @@ ecm_add_app_icon(kdevelop_SRCS ICONS
 
 qt5_add_resources(kdevelop_SRCS kdevelop.qrc)
 add_executable(kdevelop ${kdevelop_SRCS} )
-
 target_link_libraries(kdevelop
     KDev::Interfaces
     KDev::Shell
@@ -55,10 +44,16 @@ target_link_libraries(kdevelop
     KF5::Declarative
     KF5::IconThemes
     KF5::Crash
+
+    Qt5::Quick
 )
 IF(APPLE)
     target_link_libraries(kdevelop "-framework CoreFoundation")
 ENDIF()
+if(KDEVELOP_SINGLE_APP)
+    add_subdirectory(3rdparty/qtsingleapplication)
+    target_link_libraries(kdevelop qtsingleapplication)
+endif()
 
 install(TARGETS kdevelop ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 

diff --git a/app/kdevelop! b/app/kdevelop!
@@ -24,7 +24,7 @@ export APPLICATION=KDevelop
 if ! [ "$KDEV_ATTACHED_PID" ]; then
     ARGS=""
     if [ $# -eq 0 ]; then
-        ARGS="-pss"
+        ARGS="--pss"
     else
         ARGS="$@"
     fi

diff --git a/app/kdevelop.xml b/app/kdevelop.xml
@@ -9,6 +9,7 @@
     <comment xml:lang="de">KDevelop-Projektdatei</comment>
     <comment xml:lang="en_GB">KDevelop Project File</comment>
     <comment xml:lang="es">Archivo de proyecto de KDevelop</comment>
+    <comment xml:lang="fr">Fichiers de projet KDevelop</comment>
     <comment xml:lang="gl">Ficheiro de proxecto de KDevelop</comment>
     <comment xml:lang="it">File di progetto di KDevelop</comment>
     <comment xml:lang="nl">Projectbestand van KDevelop</comment>

diff --git a/app/main.cpp b/app/main.cpp
@@ -49,6 +49,8 @@
 #include <QDBusInterface>
 #include <QDBusReply>
 
+#include <QQuickWindow>
+
 #include <shell/core.h>
 #include <shell/mainwindow.h>
 #include <shell/projectcontroller.h>
@@ -94,7 +96,7 @@ void openFiles(const QVector<UrlInfo>& infos)
 {
     foreach (const UrlInfo& info, infos) {
         if (!ICore::self()->documentController()->openDocument(info.url, info.cursor)) {
-            qWarning() << i18n("Could not open %1", info.url.toDisplayString(QUrl::PreferLocalFile));
+            qWarning(APP) << i18n("Could not open %1", info.url.toDisplayString(QUrl::PreferLocalFile));
         }
     }
 }
@@ -164,7 +166,7 @@ private Q_SLOTS:
             QString x11SessionId = QStringLiteral("%1_%2").arg(sm.sessionId()).arg(sm.sessionKey());
             const auto activeSession = KDevelop::Core::self()->sessionController()->activeSession();
             if (!activeSession) {
-                qWarning() << "No active session, can't save state";
+                qWarning(APP) << "No active session, can't save state";
                 return;
             }
 
@@ -304,6 +306,13 @@ int main( int argc, char *argv[] )
     QElapsedTimer timer;
     timer.start();
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+    // If possible, use the Software backend for QQuickWidget (currently used in the
+    // welcome page plugin). This means we don't need OpenGL at all, avoiding issues
+    // like https://bugs.kde.org/show_bug.cgi?id=386527.
+    QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
+#endif
+
     // TODO: Maybe generalize, add KDEVELOP_STANDALONE build option
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
     qputenv("KDE_FORK_SLAVES", "1"); // KIO slaves will be forked off instead of being started via DBus
@@ -658,7 +667,7 @@ int main( int argc, char *argv[] )
         const KDevelop::SessionInfo* sessionData = findSessionInList(availableSessionInfos, session);
 
         if( !sessionData ) {
-            qCritical() << "session not given or does not exist";
+            qCritical(APP) << "session not given or does not exist";
             return 5;
         }
 
@@ -668,7 +677,7 @@ int main( int argc, char *argv[] )
             std::cout << pid << std::endl;
             return 0;
         } else {
-            qCritical() << sessionData->uuid.toString() << sessionData->name << "is not running";
+            qCritical(APP) << sessionData->uuid.toString() << sessionData->name << "is not running";
             return 5;
         }
     }

diff --git a/app/org.kde.kdevelop.desktop b/app/org.kde.kdevelop.desktop
@@ -73,7 +73,10 @@ GenericName[zh_TW]=整合開發環境
 Comment=Plugin-extensible IDE for C/C++ and other programming languages
 Comment[ca]=Un IDE ampliable amb connectors per al C/C++ i altres llenguatges de programació
 Comment[ca@valencia]=Un IDE ampliable amb connectors per al C/C++ i altres llenguatges de programació
+Comment[de]=Eine integrierte Entwicklungsumgebung (IDE) für C/C++ und andere Programmiersprachen, die durch Module erweitert werden kann.
+Comment[en_GB]=Plugin-extensible IDE for C/C++ and other programming languages
 Comment[es]=Entorno de desarrollo integrado para C/C++ y otros lenguajes de programación que se puede extender con complementos
+Comment[fr]=Il s'agit d'un environnement de développement complet et extensible pour le C / C++ et d'autres langages de programmation.
 Comment[it]=IDE estensibile per C/C++ ed altri linguaggi di programmazione
 Comment[nl]=IDE voor C/C++ en andere programmeertalen, uit te breiden met plug-ins.
 Comment[pl]=Zintegrowane środowisko programistyczne dla C/C++ i innych języków programowania z możliwością rozszerzenia o wtyczki

diff --git a/app/org.kde.kdevelop_ps.desktop b/app/org.kde.kdevelop_ps.desktop
@@ -68,7 +68,10 @@ GenericName[zh_TW]=整合開發環境（選擇要開始的工作階段）
 Comment=Plugin-extensible IDE for C/C++ and other programming languages (Pick Session to start with)
 Comment[ca]=Un IDE ampliable amb connectors per al C/C++ i altres llenguatges de programació (trieu Sessió per a començar-hi)
 Comment[ca@valencia]=Un IDE ampliable amb connectors per al C/C++ i altres llenguatges de programació (trieu Sessió per a començar-hi)
+Comment[de]=Eine integrierte Entwicklungsumgebung (IDE) für C/C++ und andere Programmiersprachen, die durch Module erweitert werden kann. Wählen Sie eine Sitzung zum Starten aus.
+Comment[en_GB]=Plugin-extensible IDE for C/C++ and other programming languages (Pick Session to start with)
 Comment[es]=Entorno de desarrollo integrado para C/C++ y otros lenguajes de programación que se puede extender con complementos (escoger sesión con la que empezar)
+Comment[fr]=Il s'agit d'un environnement de développement complet et extensible pour le C / C++ et d'autres langages de programmation (sélectionnez la session avec laquelle vous voulez commencer).
 Comment[it]=IDE estensibile per C/C++ ed altri linguaggi di programmazione (Scegliere la sessione con cui iniziare)
 Comment[nl]=IDE voor C/C++ en andere programmeertalen, uit te breiden met plug-ins. (Kies sessie om mee te beginnen)
 Comment[pl]=Zintegrowane środowisko programistyczne dla C/C++ i innych języków programowania z możliwością rozszerzenia o wtyczki (Wybór sesji do rozpoczęcia)

diff --git a/app_templates/cpp/CMake/cmake_kdevplugin/src/%{APPNAMELC}.json b/app_templates/cpp/CMake/cmake_kdevplugin/src/%{APPNAMELC}.json
@@ -1,10 +1,8 @@
 {
     "KPlugin": {
         "Description": "%{APPNAME}",
-        "Description[x-test]": "xx%{APPNAME}xx",
         "Id": "%{APPNAMELC}",
         "Name": "%{APPNAME}",
-        "Name[x-test]": "xx%{APPNAME}xx",
         "ServiceTypes": [
             "KDevelop/Plugin"
         ]

diff --git a/app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate b/app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate
@@ -3,6 +3,7 @@ Name=QMake Qt5 QWidgets GUI Application
 Name[ca]=Una aplicació IGU per a QMake Qt5 QWidgets
 Name[ca@valencia]=Una aplicació IGU per a QMake Qt5 QWidgets
 Name[cs]=Aplikace prostředí QMake Qt5 QWidgets
+Name[en_GB]=QMake Qt5 QWidgets GUI Application
 Name[es]=Aplicación con interfaz gráfica con QWidgets de Qt5 y QMake
 Name[fr]=Une application graphique avec Qt5, QMake et QWidgets
 Name[it]=Applicazione con GUI in QWidgets di Qt5 e QMake
@@ -20,8 +21,9 @@ Comment=Generate a QMake/Qt5 based GUI application (crossplatform compatible)
 Comment[ca]=Genera una aplicació IGU basada en QMake/Qt5 (compatible amb multiplataforma)
 Comment[ca@valencia]=Genera una aplicació IGU basada en QMake/Qt5 (compatible amb multiplataforma)
 Comment[cs]=Vytvořit aplikaci založenou na QMake/Qt5 (multiplatformní)
+Comment[en_GB]=Generate a QMake/Qt5 based GUI application (crossplatform compatible)
 Comment[es]=Genera una aplicación con interfaz gráfica basada en QMake/Qt5 (compatible multiplataforma)
-Comment[fr]=Générer une application graphique basée sur QMake/Qt5 (compatible multi-plate-forme)
+Comment[fr]=Générer une application graphique fondée sur QMake/Qt5 (compatible multi-plate-forme)
 Comment[it]=Genera un'applicazione basata su QMake/Qt5 con interfaccia utente grafica (compatibile multipiattaforma)
 Comment[nl]=Op QMake/Qt5 gebaseerde GUI-toepassing genereren (crossplatform compatibel)
 Comment[pl]=Uwórz aplikację opartą na interfejsie użytkownika QMake/Qt5 (zgodne na wielu platformach)

diff --git a/appimage/Dockerfile b/appimage/Dockerfile
@@ -1,21 +1,34 @@
 FROM centos:6.8
 
-RUN yum -y update && yum -y install wget && yum -y install centos-release-scl epel-release && yum -y update && yum -y install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils wget tar bzip2 git libtool which fuse fuse-devel libpng-devel automake cppunit-devel cmake glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel libxml2-devel libstdc++-devel libXrender-devel patch xcb-util-keysyms-devel libXi-devel libudev-devel.x86_64 openssl-devel sqlite-devel.x86_64 gperftools.x86_64 gperf.x86_64 libicu-devel.x86_64 boost-devel.x86_64 libxslt-devel.x86_64 docbook-style-xsl.noarch python27.x86_64 cmake3.x86_64 ruby bison flex bison-devel ruby-devel flex-devel xz pcre-devel pcre2-devel pcre pcre2 mesa-libEGL-devel mesa-libGL-devel glib-devel gettext perl-URI.noarch bzip2-devel.x86_64 subversion-devel.x86_64 subversion.x86_64 sqlite2-devel.x86_64 hunspell-devel aspell-devel hspell-devel vim sudo unzip
+RUN yum -y update && yum -y install wget && yum -y install centos-release-scl epel-release && yum -y update && yum -y install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils wget tar bzip2 git libtool which fuse fuse-devel libpng-devel automake cppunit-devel cmake glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel libxml2-devel libstdc++-devel libXrender-devel patch xcb-util-keysyms-devel libXi-devel libudev-devel.x86_64 openssl-devel sqlite-devel.x86_64 gperftools.x86_64 gperf.x86_64 libicu-devel.x86_64 boost-devel.x86_64 libxslt-devel.x86_64 docbook-style-xsl.noarch python27.x86_64 cmake3.x86_64 ruby bison flex bison-devel ruby-devel flex-devel xz pcre-devel pcre2-devel pcre pcre2 mesa-libEGL-devel mesa-libGL-devel glib-devel gettext perl-URI.noarch bzip2-devel.x86_64 subversion-devel.x86_64 subversion.x86_64 sqlite2-devel.x86_64 hunspell-devel aspell-devel hspell-devel vim sudo unzip xkeyboard-config
 RUN cd /tmp && wget http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/subversion-1.9.4-3.x86_64.rpm http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/subversion-devel-1.9.4-3.x86_64.rpm http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/serf-1.3.7-1.x86_64.rpm && yum -y install subversion* serf*; rm subversion* serf*
 
 RUN echo ". /opt/rh/devtoolset-4/enable && chmod +x /opt/rh/python27/enable && . /opt/rh/python27/enable" >> /root/.bashrc
 
-ENV LC_ALL=en_US.UTF-8 LANG=en_us.UTF-8 QTVERSION=5.7.1 QVERSION_SHORT=5.7 LLVM_ROOT=/opt/llvm/ QTV=5.7.1 LD_LIBRARY_PATH=$QTDIR/lib/
+ENV LC_ALL=en_US.UTF-8 LANG=en_us.UTF-8 QTVERSION=5.9.2 QTVERSION_SHORT=5.9 LLVM_VERSION=5.0.0 LLVM_ROOT=/opt/llvm/ LD_LIBRARY_PATH=$QTDIR/lib/
 ENV QTDIR=/usr/local/Qt-${QTVERSION}/
 
-RUN bash -c "mkdir -p /qt && cd /qt && wget http://download.qt.io/archive/qt/${QVERSION_SHORT}/${QTVERSION}/single/qt-everywhere-opensource-src-${QTVERSION}.tar.xz && tar xvf qt-everywhere-opensource-src-${QTVERSION}.tar.xz && ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++ && ln -sf /opt/rh/devtoolset-4/root/usr/bin/c++ /usr/bin/c++ && cd /qt/qt-everywhere-opensource-src-$QTV && ./configure -v -skip qt3d -skip qtgamepad -platform linux-g++ -qt-pcre -qt-xcb -qt-xkbcommon -xkb-config-root /usr/share/X11/xkb -no-pch -qt-sql-sqlite -qt-sql-sqlite2 -nomake tests -nomake examples -confirm-license -opensource && make -j$(nproc) || make -j 1 install; make -j$(nproc) install && rm -Rf /qt"
+RUN bash -c "ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++ && ln -sf /opt/rh/devtoolset-4/root/usr/bin/c++ /usr/bin/c++"
 
-RUN bash -c "ln -sf /usr/local/Qt-$QTV/bin/qmake /usr/bin/qmake-qt5 && mkdir -p /qtwk && cd /qtwk && wget http://download.qt.io/community_releases/${QVERSION_SHORT}/${QTV}/qtwebkit-opensource-src-${QTV}.tar.xz && tar xvf qtwebkit-opensource-src-${QTV}.tar.xz && cd /qtwk/qtwebkit-opensource-src-${QTV} &&  $QTDIR/bin/qmake && make -j$(nproc) || make -j$(nproc) && make -j$(nproc) install && rm -Rf /qtwk"
+# Build Qt5
+RUN bash -c "mkdir -p /qt && cd /qt && wget http://download.qt.io/archive/qt/${QTVERSION_SHORT}/${QTVERSION}/single/qt-everywhere-opensource-src-${QTVERSION}.tar.xz && tar xvf qt-everywhere-opensource-src-${QTVERSION}.tar.xz "
+RUN bash -c "export MAKEFLAGS=-j$(nproc) && cd /qt/qt-everywhere-opensource-src-${QTVERSION} && ./configure -v -skip qt3d -skip qtgamepad -platform linux-g++ -qt-pcre -qt-xcb -qt-xkbcommon-x11 -xkb-config-root /usr/share/X11/xkb -no-pch -nomake tests -nomake examples -confirm-license -opensource && make -j$(nproc) || make -j 1 install; make -j$(nproc) install && rm -Rf /qt"
 
-RUN bash -c "mkdir -p /llvm && cd /llvm && wget http://llvm.org/releases/3.9.1/llvm-3.9.1.src.tar.xz && tar xvf llvm-3.9.1.src.tar.xz && cd llvm-3.9.1.src && cd tools && wget http://llvm.org/releases/3.9.1/cfe-3.9.1.src.tar.xz && tar xvf cfe-3.9.1.src.tar.xz && . /opt/rh/python27/enable && . /opt/rh/devtoolset-4/enable && python --version && cd /llvm/llvm-3.9.1.src && mkdir -p build && cd build && cmake3 .. -DCMAKE_INSTALL_PREFIX=/opt/llvm/ -DCMAKE_BUILD_TYPE=Release && make -j$(nproc) install && rm -Rf /llvm"
+RUN ln -sf /usr/local/Qt-${QTVERSION}/bin/qmake /usr/bin/qmake-qt5
 
-RUN bash -c "mkdir -p /python && cd /python && wget https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz && tar xvf Python-3.6.0.tar.xz && cd /python/Python-3.6.0 && mkdir -p /usr/lib/pkgconfig && ./configure --prefix=/usr --enable-shared && make -j$(nproc) install && rm -Rf /python"
+# Build qtwebkit
+RUN bash -c "mkdir -p /qtwk && cd /qtwk && wget http://download.qt.io/archive/qt/${QTVERSION_SHORT}/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz && tar xvf qtwebkit-opensource-src-5.9.1.tar.xz"
+RUN bash -c "cd /qtwk/qtwebkit-opensource-src-5.9.1 &&  $QTDIR/bin/qmake && make -j$(nproc) || make -j$(nproc) && make -j$(nproc) install && rm -Rf /qtwk"
 
+# Install ninja
 RUN bash -c "yum install unzip && mkdir -p /tmp/deploy && cd /tmp/deploy && wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip && unzip ninja-linux.zip && mv -f ninja /usr/local/bin && cd .. && rm -Rf deploy"
 
+# Build Clang/LLVM
+RUN bash -c "mkdir -p /llvm && cd /llvm && wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && tar xvf llvm-${LLVM_VERSION}.src.tar.xz && cd llvm-${LLVM_VERSION}.src && cd tools && wget http://llvm.org/releases/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz && tar xvf cfe-${LLVM_VERSION}.src.tar.xz"
+RUN bash -c ". /opt/rh/python27/enable && . /opt/rh/devtoolset-4/enable && python --version && cd /llvm/llvm-${LLVM_VERSION}.src && mkdir -p build && cd build && cmake3 -G Ninja .. -DCMAKE_INSTALL_PREFIX=/opt/llvm/ -DCMAKE_BUILD_TYPE=Release && ninja install && rm -Rf /llvm"
+
+# Build Python
+RUN bash -c "mkdir -p /python && cd /python && wget https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz && tar xvf Python-3.6.0.tar.xz && cd /python/Python-3.6.0 && mkdir -p /usr/lib/pkgconfig && ./configure --prefix=/usr --enable-shared && make -j$(nproc) install && rm -Rf /python"
+
+
 CMD /bin/bash
diff --git a/appimage/kdevelop-recipe-centos6.sh b/appimage/kdevelop-recipe-centos6.sh
@@ -19,8 +19,8 @@ git_pull_rebase_helper()
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-QTVERSION=5.7.1
-QVERSION_SHORT=5.7
+QTVERSION=5.9.2
+QTVERSION_SHORT=5.9
 QTDIR=/usr/local/Qt-${QTVERSION}/
 
 if [ -z "$KDEVELOP_VERSION" ]; then
@@ -29,7 +29,7 @@ fi
 if [ -z "$KDEV_PG_QT_VERSION" ]; then
     KDEV_PG_QT_VERSION=2.0
 fi
-KF5_VERSION=v5.32.0
+KF5_VERSION=v5.37.0
 KDE_PLASMA_VERSION=master # need libksysguard master (contains a0e69617442d720c76da5ebe3323e7a977929db4 -- patch which makes plasma dep optional)
 KDE_APPLICATION_VERSION=v16.12.3
 GRANTLEE_VERSION=v5.1.0