Move QtVersionFactory to QtSupport module

After this is done, QbsProjectManager/CMakeProjectManager will be able to
have full Qt support work without having to depend on Qt4ProjectManager.
It's should belong here.

Change-Id: I577d47cb8a40eb697aa862fbec36c56ff05004f0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

22 files changed, 132 insertions, 143 deletions

diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt-desktop.pri b/src/plugins/qt4projectmanager/qt-desktop/qt-desktop.pri
deleted file mode 100644
index 46424cc4b0..0000000000
--- a/src/plugins/qt4projectmanager/qt-desktop/qt-desktop.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-
-HEADERS += \
-    $$PWD/qt4runconfiguration.h \
-    $$PWD/desktopqtversionfactory.h \
-    $$PWD/simulatorqtversionfactory.h \
-    $$PWD/desktopqtversion.h \
-    $$PWD/simulatorqtversion.h
-
-SOURCES += \
-    $$PWD/qt4runconfiguration.cpp \
-    $$PWD/desktopqtversionfactory.cpp \
-    $$PWD/simulatorqtversionfactory.cpp \
-    $$PWD/desktopqtversion.cpp \
-    $$PWD/simulatorqtversion.cpp
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 6e8b302dff..a5e9b46713 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -30,6 +30,7 @@
 #include "qt4buildconfiguration.h"
 
 #include "qmakebuildinfo.h"
+#include "qmakekitinformation.h"
 #include "qt4project.h"
 #include "qt4projectconfigwidget.h"
 #include "qt4projectmanagerconstants.h"
@@ -49,7 +50,6 @@
 #include <projectexplorer/toolchainmanager.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtversionmanager.h>
-#include <qt4projectmanager/qmakekitinformation.h>
 #include <utils/qtcassert.h>
 #include <QDebug>
 
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index e574c4bc9b..519b614302 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -61,8 +61,7 @@ HEADERS += \
     librarydetailscontroller.h \
     findqt4profiles.h \
     qt4projectmanager_global.h \
-    winceqtversionfactory.h \
-    winceqtversion.h \
+    qt4runconfiguration.h \
     profilecompletionassist.h
 
 SOURCES += \
@@ -119,8 +118,7 @@ SOURCES += \
     addlibrarywizard.cpp \
     librarydetailscontroller.cpp \
     findqt4profiles.cpp \
-    winceqtversionfactory.cpp \
-    winceqtversion.cpp \
+    qt4runconfiguration.cpp \
     profilecompletionassist.cpp
 
 FORMS += makestep.ui \
@@ -136,5 +134,4 @@ FORMS += makestep.ui \
 RESOURCES += qt4projectmanager.qrc \
     wizards/wizards.qrc
 
-include(qt-desktop/qt-desktop.pri)
 include(customwidgetwizard/customwidgetwizard.pri)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 8d0e6b98f6..88db16ce78 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -51,8 +51,7 @@ QtcPlugin {
             "qt4projectmanagerconstants.h",
             "qt4projectmanagerplugin.cpp", "qt4projectmanagerplugin.h",
             "qtmodulesinfo.cpp", "qtmodulesinfo.h",
-            "winceqtversion.cpp", "winceqtversion.h",
-            "winceqtversionfactory.cpp", "winceqtversionfactory.h"
+            "qt4runconfiguration.cpp", "qt4runconfiguration.h",
         ]
     }
 
@@ -85,18 +84,6 @@ QtcPlugin {
     }
 
     Group {
-        name: "Qt/Desktop"
-        prefix: "qt-desktop/"
-        files: [
-            "desktopqtversion.cpp", "desktopqtversion.h",
-            "desktopqtversionfactory.cpp", "desktopqtversionfactory.h",
-            "qt4runconfiguration.cpp", "qt4runconfiguration.h",
-            "simulatorqtversion.cpp", "simulatorqtversion.h",
-            "simulatorqtversionfactory.cpp", "simulatorqtversionfactory.h"
-        ]
-    }
-
-    Group {
         name: "Wizards"
         prefix: "wizards/"
         files: [
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index d23d8045a6..cc4c14588b 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -34,6 +34,7 @@
 #include "qmakestep.h"
 #include "makestep.h"
 #include "qt4buildconfiguration.h"
+#include "qt4runconfiguration.h"
 #include "wizards/consoleappwizard.h"
 #include "wizards/guiappwizard.h"
 #include "wizards/librarywizard.h"
@@ -49,10 +50,6 @@
 #include "qt4project.h"
 #include "externaleditors.h"
 #include "profilecompletionassist.h"
-#include "qt-desktop/qt4runconfiguration.h"
-#include "qt-desktop/desktopqtversionfactory.h"
-#include "qt-desktop/simulatorqtversionfactory.h"
-#include "winceqtversionfactory.h"
 #include "qmakekitinformation.h"
 #include "profilehighlighterfactory.h"
 
@@ -149,10 +146,6 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
         addAutoReleasedObject(new DesignerExternalEditor);
     addAutoReleasedObject(new LinguistExternalEditor);
 
-    addAutoReleasedObject(new DesktopQtVersionFactory);
-    addAutoReleasedObject(new SimulatorQtVersionFactory);
-    addAutoReleasedObject(new WinCeQtVersionFactory);
-
     addAutoReleasedObject(new ProFileCompletionAssistProvider);
     addAutoReleasedObject(new ProFileHoverHandler(this));
     addAutoReleasedObject(new ProFileHighlighterFactory);
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 3e215d1a85..606371886c 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -29,9 +29,9 @@
 
 #include "qt4runconfiguration.h"
 
-#include "../qt4nodes.h"
-#include "../qt4project.h"
-#include "../qt4buildconfiguration.h"
+#include "qt4nodes.h"
+#include "qt4project.h"
+#include "qt4buildconfiguration.h"
 
 #include <coreplugin/coreconstants.h>
 #include <projectexplorer/localenvironmentaspect.h>
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 1527a4b524..1527a4b524 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qtsupport/desktopqtversion.cpp
index deab7c39cb..8e4943fbe2 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qtsupport/desktopqtversion.cpp
@@ -28,14 +28,14 @@
 ****************************************************************************/
 
 #include "desktopqtversion.h"
+#include "qtsupportconstants.h"
 
-#include <qtsupport/qtsupportconstants.h>
 #include <coreplugin/featureprovider.h>
 
 #include <QCoreApplication>
 
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QtSupport;
+using namespace QtSupport::Internal;
 
 DesktopQtVersion::DesktopQtVersion()
     : BaseQtVersion()
@@ -61,15 +61,15 @@ DesktopQtVersion *DesktopQtVersion::clone() const
 
 QString DesktopQtVersion::type() const
 {
-    return QLatin1String(QtSupport::Constants::DESKTOPQT);
+    return QLatin1String(Constants::DESKTOPQT);
 }
 
 QStringList DesktopQtVersion::warningReason() const
 {
     QStringList ret = BaseQtVersion::warningReason();
-    if (qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0) && qmlsceneCommand().isEmpty())
+    if (qtVersion() >= QtVersionNumber(5, 0, 0) && qmlsceneCommand().isEmpty())
         ret << QCoreApplication::translate("QtVersion", "No qmlscene installed.");
-    if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty())
+    if (qtVersion() >= QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty())
         ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed.");
     return ret;
 }
@@ -86,18 +86,18 @@ QString DesktopQtVersion::description() const
 
 Core::FeatureSet DesktopQtVersion::availableFeatures() const
 {
-    Core::FeatureSet features = QtSupport::BaseQtVersion::availableFeatures();
-    features |= Core::FeatureSet(QtSupport::Constants::FEATURE_DESKTOP);
-    features |= Core::Feature(QtSupport::Constants::FEATURE_QMLPROJECT);
+    Core::FeatureSet features = BaseQtVersion::availableFeatures();
+    features |= Core::FeatureSet(Constants::FEATURE_DESKTOP);
+    features |= Core::Feature(Constants::FEATURE_QMLPROJECT);
     return features;
 }
 
 QString DesktopQtVersion::platformName() const
 {
-    return QLatin1String(QtSupport::Constants::DESKTOP_PLATFORM);
+    return QLatin1String(Constants::DESKTOP_PLATFORM);
 }
 
 QString DesktopQtVersion::platformDisplayName() const
 {
-    return QLatin1String(QtSupport::Constants::DESKTOP_PLATFORM_TR);
+    return QLatin1String(Constants::DESKTOP_PLATFORM_TR);
 }
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h b/src/plugins/qtsupport/desktopqtversion.h
index 6e81518439..7c4ccca547 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h
+++ b/src/plugins/qtsupport/desktopqtversion.h
@@ -30,13 +30,12 @@
 #ifndef DESKTOPQTVERSION_H
 #define DESKTOPQTVERSION_H
 
-#include <qtsupport/baseqtversion.h>
-
-namespace Qt4ProjectManager {
+#include "baseqtversion.h"
 
+namespace QtSupport {
 namespace Internal {
 
-class DesktopQtVersion : public QtSupport::BaseQtVersion
+class DesktopQtVersion : public BaseQtVersion
 {
 public:
     DesktopQtVersion();
@@ -57,7 +56,7 @@ public:
     QString platformDisplayName() const;
 };
 
-}
-}
+} // Internal
+} // QtSupport
 
 #endif // DESKTOPQTVERSION_H
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp b/src/plugins/qtsupport/desktopqtversionfactory.cpp
index 41586f88de..b2f2006fbe 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
+++ b/src/plugins/qtsupport/desktopqtversionfactory.cpp
@@ -32,11 +32,11 @@
 
 #include <QFileInfo>
 
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QtSupport;
+using namespace QtSupport::Internal;
 
 DesktopQtVersionFactory::DesktopQtVersionFactory(QObject *parent)
-    : QtSupport::QtVersionFactory(parent)
+    : QtVersionFactory(parent)
 {
 
 }
@@ -48,10 +48,10 @@ DesktopQtVersionFactory::~DesktopQtVersionFactory()
 
 bool DesktopQtVersionFactory::canRestore(const QString &type)
 {
-    return type == QLatin1String(QtSupport::Constants::DESKTOPQT);
+    return type == QLatin1String(Constants::DESKTOPQT);
 }
 
-QtSupport::BaseQtVersion *DesktopQtVersionFactory::restore(const QString &type, const QVariantMap &data)
+BaseQtVersion *DesktopQtVersionFactory::restore(const QString &type, const QVariantMap &data)
 {
     if (!canRestore(type))
         return 0;
@@ -66,7 +66,7 @@ int DesktopQtVersionFactory::priority() const
     return 0;
 }
 
-QtSupport::BaseQtVersion *DesktopQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource)
+BaseQtVersion *DesktopQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource)
 {
     Q_UNUSED(evaluator);
     // we are the fallback :) so we don't care what kind of qt it is
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.h b/src/plugins/qtsupport/desktopqtversionfactory.h
index d33cb60107..f9976c7daf 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.h
+++ b/src/plugins/qtsupport/desktopqtversionfactory.h
@@ -30,26 +30,25 @@
 #ifndef DESKTOPQTVERSIONFACTORY_H
 #define DESKTOPQTVERSIONFACTORY_H
 
-#include <qtsupport/qtversionfactory.h>
+#include "qtversionfactory.h"
 
-namespace Qt4ProjectManager{
+namespace QtSupport {
 namespace Internal {
 
-class DesktopQtVersionFactory : public QtSupport::QtVersionFactory
+class DesktopQtVersionFactory : public QtVersionFactory
 {
 public:
     explicit DesktopQtVersionFactory(QObject *parent = 0);
     ~DesktopQtVersionFactory();
 
     virtual bool canRestore(const QString &type);
-    virtual QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data);
+    virtual BaseQtVersion *restore(const QString &type, const QVariantMap &data);
 
     virtual int priority() const;
-    virtual QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString());
+    virtual BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString());
 };
 
 } // Internal
-} // Qt4ProjectManager
-
+} // QtSupport
 
 #endif // DESKTOPQTVERSIONFACTORY_H
diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro
index af48b82a6f..b6c5cd40c8 100644
--- a/src/plugins/qtsupport/qtsupport.pro
+++ b/src/plugins/qtsupport/qtsupport.pro
@@ -30,7 +30,13 @@ HEADERS += \
     exampleslistmodel.h \
     screenshotcropper.h \
     qtconfigwidget.h \
-    qtfeatureprovider.h
+    qtfeatureprovider.h \
+    desktopqtversionfactory.h \
+    simulatorqtversionfactory.h \
+    desktopqtversion.h \
+    simulatorqtversion.h \
+    winceqtversionfactory.h \
+    winceqtversion.h
 
 SOURCES += \
     qtsupportplugin.cpp \
@@ -53,7 +59,13 @@ SOURCES += \
     qtparser.cpp \
     exampleslistmodel.cpp \
     screenshotcropper.cpp \
-    qtconfigwidget.cpp
+    qtconfigwidget.cpp \
+    desktopqtversionfactory.cpp \
+    simulatorqtversionfactory.cpp \
+    desktopqtversion.cpp \
+    simulatorqtversion.cpp \
+    winceqtversionfactory.cpp \
+    winceqtversion.cpp
 
 greaterThan(QT_MAJOR_VERSION, 4) {
     QT += quick
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 7c03c0052b..e764c190cb 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -113,6 +113,18 @@ QtcPlugin {
     ]
 
     Group {
+        name: "QtVersion"
+        files: [
+            "desktopqtversion.cpp", "desktopqtversion.h",
+            "desktopqtversionfactory.cpp", "desktopqtversionfactory.h",
+            "simulatorqtversion.cpp", "simulatorqtversion.h",
+            "simulatorqtversionfactory.cpp", "simulatorqtversionfactory.h",
+            "winceqtversion.cpp", "winceqtversion.h",
+            "winceqtversionfactory.cpp", "winceqtversionfactory.h",
+        ]
+    }
+
+    Group {
         name: "Getting Started Welcome Page"
         condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1")
         files: [
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index 7aae247e14..af6e7feffb 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -30,11 +30,14 @@
 #include "qtsupportplugin.h"
 
 #include "customexecutablerunconfiguration.h"
-#include "qtoptionspage.h"
+#include "desktopqtversionfactory.h"
+#include "qtfeatureprovider.h"
 #include "qtkitinformation.h"
+#include "qtoptionspage.h"
 #include "qtversionmanager.h"
-#include "qtfeatureprovider.h"
+#include "simulatorqtversionfactory.h"
 #include "uicodemodelsupport.h"
+#include "winceqtversionfactory.h"
 
 #include "profilereader.h"
 
@@ -70,6 +73,9 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes
         return false;
 
     addAutoReleasedObject(new QtVersionManager);
+    addAutoReleasedObject(new DesktopQtVersionFactory);
+    addAutoReleasedObject(new SimulatorQtVersionFactory);
+    addAutoReleasedObject(new WinCeQtVersionFactory);
     addAutoReleasedObject(new UiCodeModelManager);
 
     QtFeatureProvider *featureMgr = new QtFeatureProvider;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qtsupport/simulatorqtversion.cpp
index f24d686fed..8c8a73e63e 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
+++ b/src/plugins/qtsupport/simulatorqtversion.cpp
@@ -28,23 +28,23 @@
 ****************************************************************************/
 
 #include "simulatorqtversion.h"
+#include "qtsupportconstants.h"
 
-#include <qtsupport/qtsupportconstants.h>
 #include <coreplugin/featureprovider.h>
 
 #include <QCoreApplication>
 
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QtSupport;
+using namespace QtSupport::Internal;
 
 SimulatorQtVersion::SimulatorQtVersion()
-    : QtSupport::BaseQtVersion()
+    : BaseQtVersion()
 {
 
 }
 
 SimulatorQtVersion::SimulatorQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
-    : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource)
+    : BaseQtVersion(path, isAutodetected, autodetectionSource)
 {
     setDisplayName(defaultDisplayName(qtVersionString(), path, false));
 }
@@ -61,15 +61,15 @@ SimulatorQtVersion *SimulatorQtVersion::clone() const
 
 QString SimulatorQtVersion::type() const
 {
-    return QLatin1String(QtSupport::Constants::SIMULATORQT);
+    return QLatin1String(Constants::SIMULATORQT);
 }
 
 QStringList SimulatorQtVersion::warningReason() const
 {
     QStringList ret = BaseQtVersion::warningReason();
-    if (qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0) && qmlsceneCommand().isEmpty())
+    if (qtVersion() >= QtVersionNumber(5, 0, 0) && qmlsceneCommand().isEmpty())
         ret << QCoreApplication::translate("QtVersion", "No qmlscene installed.");
-    if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty())
+    if (qtVersion() >= QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty())
         ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed.");
     return ret;
 }
@@ -87,9 +87,8 @@ QString SimulatorQtVersion::description() const
 
 Core::FeatureSet SimulatorQtVersion::availableFeatures() const
 {
-    Core::FeatureSet features = QtSupport::BaseQtVersion::availableFeatures();
-    features |= Core::FeatureSet(QtSupport::Constants::FEATURE_MOBILE);
-
+    Core::FeatureSet features = BaseQtVersion::availableFeatures();
+    features |= Core::FeatureSet(Constants::FEATURE_MOBILE);
     return features;
 }
 
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h b/src/plugins/qtsupport/simulatorqtversion.h
index e32b00edb2..2a3487bb4f 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h
+++ b/src/plugins/qtsupport/simulatorqtversion.h
@@ -30,13 +30,12 @@
 #ifndef SIMULATORQTVERSION_H
 #define SIMULATORQTVERSION_H
 
-#include <qtsupport/baseqtversion.h>
-
-namespace Qt4ProjectManager{
+#include "baseqtversion.h"
 
+namespace QtSupport {
 namespace Internal {
 
-class SimulatorQtVersion : public QtSupport::BaseQtVersion
+class SimulatorQtVersion : public BaseQtVersion
 {
 public:
     SimulatorQtVersion();
@@ -56,7 +55,7 @@ public:
     bool supportsPlatform(const QString &platformName) const;
 };
 
-}
-}
+} // Internal
+} // QtSupport
 
 #endif // SIMULATORQTVERSION_H
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp b/src/plugins/qtsupport/simulatorqtversionfactory.cpp
index 21e7b3bbe9..745d15c13d 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp
+++ b/src/plugins/qtsupport/simulatorqtversionfactory.cpp
@@ -29,14 +29,13 @@
 
 #include "simulatorqtversionfactory.h"
 #include "simulatorqtversion.h"
-
-#include <qtsupport/qtsupportconstants.h>
-#include <qtsupport/profilereader.h>
+#include "qtsupportconstants.h"
+#include "profilereader.h"
 
 #include <QFileInfo>
 
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QtSupport;
+using namespace QtSupport::Internal;
 
 SimulatorQtVersionFactory::SimulatorQtVersionFactory(QObject *parent)
     : QtVersionFactory(parent)
@@ -51,14 +50,14 @@ SimulatorQtVersionFactory::~SimulatorQtVersionFactory()
 
 bool SimulatorQtVersionFactory::canRestore(const QString &type)
 {
-    return type == QLatin1String(QtSupport::Constants::SIMULATORQT);
+    return type == QLatin1String(Constants::SIMULATORQT);
 }
 
-QtSupport::BaseQtVersion *SimulatorQtVersionFactory::restore(const QString &type, const QVariantMap &data)
+BaseQtVersion *SimulatorQtVersionFactory::restore(const QString &type, const QVariantMap &data)
 {
     if (!canRestore(type))
         return 0;
-    QtSupport::BaseQtVersion *v = new SimulatorQtVersion;
+    BaseQtVersion *v = new SimulatorQtVersion;
     v->fromMap(data);
     return v;
 }
@@ -69,7 +68,7 @@ int SimulatorQtVersionFactory::priority() const
     return 50;
 }
 
-QtSupport::BaseQtVersion *SimulatorQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource)
+BaseQtVersion *SimulatorQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource)
 {
     QFileInfo fi = qmakePath.toFileInfo();
     if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.h b/src/plugins/qtsupport/simulatorqtversionfactory.h
index d30c547dc2..70a0c5946f 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.h
+++ b/src/plugins/qtsupport/simulatorqtversionfactory.h
@@ -30,26 +30,25 @@
 #ifndef SIMULATORQTVERSIONFACTORY_H
 #define SIMULATORQTVERSIONFACTORY_H
 
-#include <qtsupport/qtversionfactory.h>
+#include "qtversionfactory.h"
 
-namespace Qt4ProjectManager {
+namespace QtSupport {
 namespace Internal {
 
-class SimulatorQtVersionFactory : public QtSupport::QtVersionFactory
+class SimulatorQtVersionFactory : public QtVersionFactory
 {
 public:
     explicit SimulatorQtVersionFactory(QObject *parent = 0);
     ~SimulatorQtVersionFactory();
 
     virtual bool canRestore(const QString &type);
-    virtual QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data);
+    virtual BaseQtVersion *restore(const QString &type, const QVariantMap &data);
 
     virtual int priority() const;
-    virtual QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString());
+    virtual BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString());
 };
 
 } // Internal
-} // Qt4ProjectManager
-
+} // QtSupport
 
 #endif // SIMULATORQTVERSIONFACTORY_H
diff --git a/src/plugins/qt4projectmanager/winceqtversion.cpp b/src/plugins/qtsupport/winceqtversion.cpp
index 4c1c0dc8c3..362004014d 100644
--- a/src/plugins/qt4projectmanager/winceqtversion.cpp
+++ b/src/plugins/qtsupport/winceqtversion.cpp
@@ -28,23 +28,24 @@
 ****************************************************************************/
 
 #include "winceqtversion.h"
-#include <qtsupport/qtsupportconstants.h>
+#include "qtsupportconstants.h"
+
 #include <QCoreApplication>
 #include <QStringList>
 
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QtSupport;
+using namespace QtSupport::Internal;
 
 WinCeQtVersion::WinCeQtVersion()
-    : QtSupport::BaseQtVersion(),
+    : BaseQtVersion(),
       m_archType(ProjectExplorer::Abi::ArmArchitecture)
 {
 }
 
 WinCeQtVersion::WinCeQtVersion(const Utils::FileName &path, const QString &archType,
-        bool isAutodetected, const QString &autodetectionSource)
-  : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource),
-    m_archType(ProjectExplorer::Abi::ArmArchitecture)
+                               bool isAutodetected, const QString &autodetectionSource)
+    : BaseQtVersion(path, isAutodetected, autodetectionSource),
+      m_archType(ProjectExplorer::Abi::ArmArchitecture)
 {
     if (0 == archType.compare(QLatin1String("x86"), Qt::CaseInsensitive))
         m_archType = ProjectExplorer::Abi::X86Architecture;
@@ -64,7 +65,7 @@ WinCeQtVersion *WinCeQtVersion::clone() const
 
 QString WinCeQtVersion::type() const
 {
-    return QLatin1String(QtSupport::Constants::WINCEQT);
+    return QLatin1String(Constants::WINCEQT);
 }
 
 QList<ProjectExplorer::Abi> WinCeQtVersion::detectQtAbis() const
@@ -80,7 +81,7 @@ QList<ProjectExplorer::Abi> WinCeQtVersion::detectQtAbis() const
 QString WinCeQtVersion::description() const
 {
     return QCoreApplication::translate("QtVersion",
-        "Qt for WinCE", "Qt Version is meant for WinCE");
+                                       "Qt for WinCE", "Qt Version is meant for WinCE");
 }
 
 void WinCeQtVersion::fromMap(const QVariantMap &map)
@@ -104,10 +105,10 @@ void WinCeQtVersion::fromMap(const QVariantMap &map)
 
 QString WinCeQtVersion::platformName() const
 {
-    return QLatin1String(QtSupport::Constants::WINDOWS_CE_PLATFORM);
+    return QLatin1String(Constants::WINDOWS_CE_PLATFORM);
 }
 
 QString WinCeQtVersion::platformDisplayName() const
 {
-    return QLatin1String(QtSupport::Constants::WINDOWS_CE_PLATFORM_TR);
+    return QLatin1String(Constants::WINDOWS_CE_PLATFORM_TR);
 }
diff --git a/src/plugins/qt4projectmanager/winceqtversion.h b/src/plugins/qtsupport/winceqtversion.h
index f8be3814cc..669ad56d1a 100644
--- a/src/plugins/qt4projectmanager/winceqtversion.h
+++ b/src/plugins/qtsupport/winceqtversion.h
@@ -30,17 +30,17 @@
 #ifndef WINCEQTVERSION_H
 #define WINCEQTVERSION_H
 
-#include <qtsupport/baseqtversion.h>
+#include "baseqtversion.h"
 
-namespace Qt4ProjectManager {
+namespace QtSupport {
 namespace Internal {
 
-class WinCeQtVersion : public QtSupport::BaseQtVersion
+class WinCeQtVersion : public BaseQtVersion
 {
 public:
     WinCeQtVersion();
     WinCeQtVersion(const Utils::FileName &path, const QString &archType,
-        bool isAutodetected = false, const QString &autodetectionSource = QString());
+                   bool isAutodetected = false, const QString &autodetectionSource = QString());
     ~WinCeQtVersion();
     WinCeQtVersion *clone() const;
 
@@ -59,7 +59,7 @@ private:
     ProjectExplorer::Abi::Architecture m_archType;
 };
 
-} // namespace Internal
-} // namespace Qt4ProjectManager
+} // Internal
+} // QtSupport
 
 #endif // WINCEQTVERSION_H
diff --git a/src/plugins/qt4projectmanager/winceqtversionfactory.cpp b/src/plugins/qtsupport/winceqtversionfactory.cpp
index 2f2d810fcb..bcc827a7f7 100644
--- a/src/plugins/qt4projectmanager/winceqtversionfactory.cpp
+++ b/src/plugins/qtsupport/winceqtversionfactory.cpp
@@ -29,12 +29,13 @@
 
 #include "winceqtversionfactory.h"
 #include "winceqtversion.h"
-#include <qtsupport/qtsupportconstants.h>
-#include <qtsupport/profilereader.h>
+#include "qtsupportconstants.h"
+#include "profilereader.h"
+
 #include <QFileInfo>
 
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QtSupport;
+using namespace QtSupport::Internal;
 
 WinCeQtVersionFactory::WinCeQtVersionFactory(QObject *parent)
     : QtVersionFactory(parent)
@@ -49,10 +50,10 @@ WinCeQtVersionFactory::~WinCeQtVersionFactory()
 
 bool WinCeQtVersionFactory::canRestore(const QString &type)
 {
-    return type == QLatin1String(QtSupport::Constants::WINCEQT);
+    return type == QLatin1String(Constants::WINCEQT);
 }
 
-QtSupport::BaseQtVersion *WinCeQtVersionFactory::restore(const QString &type, const QVariantMap &data)
+BaseQtVersion *WinCeQtVersionFactory::restore(const QString &type, const QVariantMap &data)
 {
     if (!canRestore(type))
         return 0;
@@ -66,7 +67,7 @@ int WinCeQtVersionFactory::priority() const
     return 50;
 }
 
-QtSupport::BaseQtVersion *WinCeQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource)
+BaseQtVersion *WinCeQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource)
 {
     QFileInfo fi = qmakePath.toFileInfo();
     if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
diff --git a/src/plugins/qt4projectmanager/winceqtversionfactory.h b/src/plugins/qtsupport/winceqtversionfactory.h
index 7bd45a18e4..0e74c0214d 100644
--- a/src/plugins/qt4projectmanager/winceqtversionfactory.h
+++ b/src/plugins/qtsupport/winceqtversionfactory.h
@@ -30,28 +30,28 @@
 #ifndef WINCEQTVERSIONFACTORY_H
 #define WINCEQTVERSIONFACTORY_H
 
-#include <qtsupport/qtversionfactory.h>
+#include "qtversionfactory.h"
 
-namespace Qt4ProjectManager {
+namespace QtSupport {
 namespace Internal {
 
-class WinCeQtVersionFactory : public QtSupport::QtVersionFactory
+class WinCeQtVersionFactory : public QtVersionFactory
 {
 public:
     explicit WinCeQtVersionFactory(QObject *parent = 0);
     ~WinCeQtVersionFactory();
 
     virtual bool canRestore(const QString &type);
-    virtual QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data);
+    virtual BaseQtVersion *restore(const QString &type, const QVariantMap &data);
 
     virtual int priority() const;
 
-    virtual QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
-                                             bool isAutoDetected = false, const QString &autoDetectionSource = QString());
+    virtual BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
+                                  bool isAutoDetected = false, const QString &autoDetectionSource = QString());
 
 };
 
 } // Internal
-} // Qt4ProjectManager
+} // QtSupport
 
 #endif // WINCEQTVERSIONFACTORY_H