diff --git a/dev-utils/_windows/qbs/qbs.py b/dev-utils/_windows/qbs/qbs.py
deleted file mode 100644
index 6107962e..00000000
--- a/dev-utils/_windows/qbs/qbs.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-import info
-
-
-class subinfo(info.infoclass):
-    def setTargets(self):
-        self.targets["1.4.4"] = "http://download.qt.io/official_releases/qbs/1.4.4/qbs-src-1.4.4.tar.gz"
-        self.targetInstSrc["1.4.4"] = "qbs-src-1.4.4"
-        self.targetDigestUrls["1.4.4"] = (
-            ["http://download.qt.io/official_releases/qbs/1.4.4/qbs-src-1.4.4.tar.gz.sha256"],
-            CraftHash.HashAlgorithm.SHA256)
-
-        self.svnTargets["master"] = "git://code.qt.io/qt-labs/qbs.git"
-        self.defaultTarget = "1.4.4"
-
-    def setDependencies(self):
-        self.runtimeDependencies["libs/qt5/qtbase"] = None
-
-
-from Package.Qt5CorePackageBase import *
-
-
-class Package(Qt5CorePackageBase):
-    def __init__(self, **args):
-        Qt5CorePackageBase.__init__(self)
-        self.subinfo.options.configure.projectFile = "qbs.pro"
-        self.subinfo.options.configure.args = " \"QBS_INSTALL_PREFIX = %s\" " % CraftStandardDirs.craftRoot().replace(
-            "\\", "/")
diff --git a/qt-apps/qtcreator/qtcreator/qtcreator.py b/qt-apps/qtcreator/qtcreator/qtcreator.py
index e3d80063..226e3bf3 100644
--- a/qt-apps/qtcreator/qtcreator/qtcreator.py
+++ b/qt-apps/qtcreator/qtcreator/qtcreator.py
@@ -1,46 +1,53 @@
 # -*- coding: utf-8 -*-
 import info
 
 
 class subinfo(info.infoclass):
     def setTargets(self):
         self.svnTargets["master"] = "https://code.qt.io/qt-creator/qt-creator.git"
         for branch in ["4.3", "4.4", "4.5", "4.8", "4.9"]:
             self.svnTargets[branch] = f"https://code.qt.io/qt-creator/qt-creator.git|{branch}"
 
         for ver in ["4.7.1", "4.8.0", "4.8.1", "4.8.2"]:
             majorVer = ".".join(ver.split(".")[:2])
             self.targets[ver] = f"http://download.qt.io/official_releases/qtcreator/{majorVer}/{ver}/qt-creator-opensource-src-{ver}.tar.xz"
             self.targetInstSrc[ver] = f"qt-creator-opensource-src-{ver}"
             self.targetDigestUrls[ver] = f"https://download.qt.io/official_releases/qtcreator/{majorVer}/{ver}/qt-creator-opensource-src-{ver}.tar.xz.sha256"
         self.patchLevel["4.7.1"] = 1
         self.defaultTarget = "4.8.2"
 
     def setDependencies(self):
         self.runtimeDependencies["libs/qt5/qtbase"] = None
         self.runtimeDependencies["libs/qt5/qtscript"] = None
         self.runtimeDependencies["libs/qt5/qtdeclarative"] = None
         self.runtimeDependencies["libs/llvm-meta/llvm"] = None
+        self.runtimeDependencies["kde/frameworks/tier1/syntax-highlighting"] = None
         self.runtimeDependencies["binary/python"] = None
+        self.runtimeDependencies["dev-utils/clazy"] = None
 
 
 from Package.Qt5CorePackageBase import *
 
 
 class Package(Qt5CorePackageBase):
     def __init__(self, **args):
         Qt5CorePackageBase.__init__(self)
+        self.subinfo.options.fetch.checkoutSubmodules = True
         self.subinfo.options.install.args = "install install_docs"
-        self._buildEnv = {}
+        root = CraftCore.standardDirs.craftRoot()
+        self._buildEnv = {
+            "KSYNTAXHIGHLIGHTING_LIB_DIR": root,
+            "QTC_ENABLE_CLANG_LIBTOOLING": "1"
+            }
         if CraftCore.compiler.isWindows:
-            self._buildEnv = {"PYTHON_INSTALL_DIR":CraftCore.settings.get("Paths", "Python")}
+            self._buildEnv.update({"PYTHON_INSTALL_DIR":CraftCore.settings.get("Paths", "Python")})
 
     def configure(self, configureDefines=""):
         with utils.ScopedEnv(self._buildEnv):
             return super().configure(configureDefines)
 
     def make(self):
         with utils.ScopedEnv(self._buildEnv):
             if not super().make():
                 return False
             return utils.system(f"{self.makeProgram} {self.makeOptions('docs')}")