diff options
| author | hjk <hjk121@nokiamail.com> | 2013-08-30 09:22:42 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-09-02 12:41:47 +0200 |
| commit | df361843714f81b1ac461c697f511ac0cd0a35a6 (patch) | |
| tree | 78f8126850f646fadbac848efb65b431061763d7 /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | ba1d8e2c4d90bd1129b3b1f42574effc8813c55b (diff) | |
| download | qt-creator-df361843714f81b1ac461c697f511ac0cd0a35a6.tar.gz | |
Core: Static pattern for ProgressManager, clean up all users
Change-Id: I4af8793ca69a3af9e99baeb7c31dad3864266f91
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 4863094309..7fa99b6b60 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -59,6 +59,7 @@ #include <QCoreApplication> #include <QProcess> +using namespace Core; using namespace QtSupport; using namespace QtSupport::Internal; using namespace ProjectExplorer; @@ -231,23 +232,23 @@ QString BaseQtVersion::defaultDisplayName(const QString &versionString, const Fi QCoreApplication::translate("QtVersion", "Qt %1 (%2)").arg(versionString, location); } -Core::FeatureSet BaseQtVersion::availableFeatures() const +FeatureSet BaseQtVersion::availableFeatures() const { - 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); + FeatureSet features = FeatureSet(Constants::FEATURE_QWIDGETS) + | FeatureSet(Constants::FEATURE_QT) + | FeatureSet(Constants::FEATURE_QT_WEBKIT) + | 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); + features |= FeatureSet(Constants::FEATURE_QT_QUICK); + features |= FeatureSet(Constants::FEATURE_QT_QUICK_1); } if (qtVersion() >= QtVersionNumber(4, 7, 1)) - features |= Core::FeatureSet(Constants::FEATURE_QT_QUICK_1_1); + features |= FeatureSet(Constants::FEATURE_QT_QUICK_1_1); if (qtVersion() >= QtVersionNumber(5, 0, 0)) - features |= Core::FeatureSet(Constants::FEATURE_QT_QUICK_2); + features |= FeatureSet(Constants::FEATURE_QT_QUICK_2); if (qtVersion() >= QtVersionNumber(5, 1, 0)) - features |= Core::FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS); + features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS); return features; } @@ -1516,8 +1517,7 @@ void BaseQtVersion::buildDebuggingHelper(ToolChain *tc, int tools) QFuture<void> task = QtConcurrent::run(&QtSupport::DebuggingHelperBuildTask::run, buildTask); const QString taskName = QCoreApplication::translate("BaseQtVersion", "Building helpers"); - Core::ICore::progressManager()->addTask(task, taskName, - QLatin1String("Qt::BuildHelpers")); + ProgressManager::addTask(task, taskName, QLatin1String("Qt::BuildHelpers")); } FileName BaseQtVersion::qtCorePath(const QHash<QString,QString> &versionInfo, const QString &versionString) |