diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 594a6f02985ebf2c246fb562981691d0d5d0a00a..37923dd406d4f9ed27b51ad104d6af1a82ea4d38 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -228,21 +228,21 @@ QString BaseQtVersion::defaultDisplayName(const QString &versionString, const Fi
 
 Core::FeatureSet BaseQtVersion::availableFeatures() const
 {
-    Core::FeatureSet features = Core::FeatureSet(QtSupport::Constants::FEATURE_QWIDGETS)
-            | Core::FeatureSet(QtSupport::Constants::FEATURE_QT)
-            | Core::FeatureSet(QtSupport::Constants::FEATURE_QT_WEBKIT)
-            | Core::FeatureSet(QtSupport::Constants::FEATURE_QT_CONSOLE);
-
-     if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0)) {
-         features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK);
-         features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_1);
+    Core::FeatureSet features = Core::FeatureSet(Constants::FEATURE_QWIDGETS)
+            | Core::FeatureSet(Constants::FEATURE_QT)
+            | Core::FeatureSet(Constants::FEATURE_QT_WEBKIT)
+            | Core::FeatureSet(Constants::FEATURE_QT_CONSOLE);
+
+     if (qtVersion() >= QtVersionNumber(4, 7, 0)) {
+         features |= Core::FeatureSet(Constants::FEATURE_QT_QUICK);
+         features |= Core::FeatureSet(Constants::FEATURE_QT_QUICK_1);
      }
-     if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 1))
-         features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_1_1);
-     if (qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0))
-         features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_2);
-     if (qtVersion() >= QtSupport::QtVersionNumber(5, 1, 0))
-         features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS);
+     if (qtVersion() >= QtVersionNumber(4, 7, 1))
+         features |= Core::FeatureSet(Constants::FEATURE_QT_QUICK_1_1);
+     if (qtVersion() >= QtVersionNumber(5, 0, 0))
+         features |= Core::FeatureSet(Constants::FEATURE_QT_QUICK_2);
+     if (qtVersion() >= QtVersionNumber(5, 1, 0))
+         features |= Core::FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS);
 
      return features;
 }
@@ -326,7 +326,7 @@ FileName BaseQtVersion::binPath() const
     return Utils::FileName::fromUserInput(qmakeProperty("QT_HOST_BINS"));
 }
 
-Utils::FileName QtSupport::BaseQtVersion::mkspecsPath() const
+Utils::FileName BaseQtVersion::mkspecsPath() const
 {
     Utils::FileName result = Utils::FileName::fromUserInput(qmakeProperty("QT_HOST_DATA"));
     if (result.isEmpty())
@@ -336,13 +336,13 @@ Utils::FileName QtSupport::BaseQtVersion::mkspecsPath() const
     return result;
 }
 
-QString QtSupport::BaseQtVersion::qtNamespace() const
+QString BaseQtVersion::qtNamespace() const
 {
     ensureMkSpecParsed();
     return m_mkspecValues.value(QLatin1String(MKSPEC_VALUE_NAMESPACE));
 }
 
-QString QtSupport::BaseQtVersion::qtLibInfix() const
+QString BaseQtVersion::qtLibInfix() const
 {
     ensureMkSpecParsed();
     return m_mkspecValues.value(QLatin1String(MKSPEC_VALUE_LIBINFIX));
@@ -916,7 +916,7 @@ void BaseQtVersion::updateVersionInfo() const
     const QString qtHeaderData = qmakeProperty("QT_INSTALL_HEADERS");
     if (!qtInstallData.isNull()) {
         if (!qtInstallData.isEmpty()) {
-            m_hasDebuggingHelper = !QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty();
+            m_hasDebuggingHelper = !DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty();
             m_hasQmlDump
                     = !QmlDumpTool::toolForQtPaths(qtInstallData, qtInstallBins, qtHeaderData, false).isEmpty()
                     || !QmlDumpTool::toolForQtPaths(qtInstallData, qtInstallBins, qtHeaderData, true).isEmpty();
@@ -1123,7 +1123,7 @@ QString BaseQtVersion::gdbDebuggingHelperLibrary() const
     QString qtInstallData = qmakeProperty("QT_INSTALL_DATA");
     if (qtInstallData.isEmpty())
         return QString();
-    return QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
+    return DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData);
 }
 
 QString BaseQtVersion::qmlDumpTool(bool debugVersion) const
@@ -1157,7 +1157,7 @@ QStringList BaseQtVersion::debuggingHelperLibraryLocations() const
     QString qtInstallData = qmakeProperty("QT_INSTALL_DATA");
     if (qtInstallData.isEmpty())
         return QStringList();
-    return QtSupport::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
+    return DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
 }
 
 bool BaseQtVersion::supportsBinaryDebuggingHelper() const