diff --git a/libs/qt5/qtdoc/qtdoc.py b/libs/qt5/qtdoc/qtdoc.py
index 90221c23..dcb000d7 100644
--- a/libs/qt5/qtdoc/qtdoc.py
+++ b/libs/qt5/qtdoc/qtdoc.py
@@ -1,24 +1,25 @@
 # -*- coding: utf-8 -*-
 import info
 
 
 class subinfo(info.infoclass):
     def setTargets(self):
         self.versionInfo.setDefaultValues()
 
     def setDependencies(self):
         self.runtimeDependencies["libs/qt5/qtbase"] = None
+        self.runtimeDependencies["libs/qt5/qttools"] = None
 
 from Package.Qt5CorePackageBase import *
 
 
 class QtPackage(Qt5CorePackageBase):
     def __init__(self, **args):
         Qt5CorePackageBase.__init__(self)
         self.subinfo.options.make.args = "docs"
         self.subinfo.options.install.args = "install_docs"
 
 
 class Package(Qt5CoreSdkPackageBase):
     def __init__(self):
         Qt5CoreSdkPackageBase.__init__(self, classA=QtPackage)
diff --git a/qt-apps/gammaray/gammaray.py b/qt-apps/gammaray/gammaray.py
index c78a420e..2e7fe33b 100644
--- a/qt-apps/gammaray/gammaray.py
+++ b/qt-apps/gammaray/gammaray.py
@@ -1,62 +1,64 @@
 
 import glob
 
 import info
 
 class subinfo(info.infoclass):
     def setTargets(self):
         self.svnTargets["master"] = "[git]https://github.com/KDAB/GammaRay.git"
         for ver in ["2.7.0", "2.9.0", "2.9.1"]:
             self.targets[ver] = f"https://github.com/KDAB/GammaRay/archive/v{ver}.tar.gz"
             self.targetInstSrc[ver] = f"GammaRay-{ver}"
             self.archiveNames[ver] = f"gammaray-{ver}.tar.gz"
         self.targetDigests['2.7.0'] = (
             ['74251d9de4bfa31994431c7a493e5de17d0b90853557a245bf3f7f4e0227fd14'], CraftHash.HashAlgorithm.SHA256)
         self.targetDigests['2.9.0'] = (
             ['f86159c77cff4aaf22feed6fb2ee012028df179f54e0e441642115f93ffc41b5'], CraftHash.HashAlgorithm.SHA256)
 
         self.description = "GammaRay is a tool to poke around in a Qt-application and also to manipulate the application to some extent"
         self.webpage = "http://www.kdab.com/gammaray"
         self.displayName = "GammaRay"
 
         self.defaultTarget = "2.9.1"
 
     def registerOptions(self):
         self.options.dynamic.registerOption("gammarayProbeOnly", False)
         self.options.dynamic.registerOption("disableGammarayBuildCliInjector", False)
 
     def setDependencies(self):
         self.runtimeDependencies["virtual/base"] = None
         self.runtimeDependencies["libs/qt5/qtbase"] = None
         self.runtimeDependencies["kde/frameworks/tier1/syntax-highlighting"] = None
         self.runtimeDependencies["qt-apps/kdstatemachineeditor"] = None
         self.runtimeDependencies["libs/openssl"] = None
         probes = CraftPackageObject.get("kdab/gammaray-binary-probes")
         if probes and probes.isInstalled:
             self.runtimeDependencies["kdab/gammaray-binary-probes"] = None
 
 
 from Package.CMakePackageBase import *
 
 
 class Package(CMakePackageBase):
     def __init__(self):
         CMakePackageBase.__init__(self)
         self.subinfo.options.needsShortPath = True
         self.subinfo.options.configure.args = "-DGAMMARAY_INSTALL_QT_LAYOUT=ON "
-        if not CraftCore.settings.getboolean("QtSDK", "Enabled", False):
-            self.subinfo.options.configure.args += " -DGAMMARAY_MULTI_BUILD=OFF"
+
+        nultiBuild = CraftPackageObject.get("libs/qt5/qtbase").subinfo.options.dynamic.buildReleaseAndDebug or CraftCore.settings.getboolean("QtSDK", "Enabled", False)
+        self.subinfo.options.configure.args += f" -DGAMMARAY_MULTI_BUILD={'ON' if nultiBuild else 'OFF'}"
+
         if self.subinfo.options.dynamic.gammarayProbeOnly:
             self.subinfo.options.configure.args += " -DGAMMARAY_PROBE_ONLY_BUILD=ON -DGAMMARAY_BUILD_DOCS=OFF"
         if self.subinfo.options.dynamic.disableGammarayBuildCliInjector:
             self.subinfo.options.configure.args += " -DGAMMARAY_BUILD_CLI_INJECTOR=OFF"
 
     def createPackage(self):
         self.subinfo.options.package.movePluginsToBin = not CraftCore.settings.getboolean("QtSDK", "Enabled", False)
         self.defines["company"] = "Klarälvdalens Datakonsult AB"
         self.defines["executable"] = "bin\\gammaray-launcher.exe"
         self.defines["license"] = os.path.join(self.sourceDir(), "LICENSE.GPL.txt")
         self.defines["icon"] = os.path.join(self.sourceDir(), "ui", "resources", "gammaray", "GammaRay.ico")
         self.ignoredPackages.append("binary/mysql")
         self.ignoredPackages.append("libs/dbus")
         return TypePackager.createPackage(self)