From 2fc561ed890656f44ac21b96f53604dd53b330e7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 27 Mar 2013 08:59:57 +0100
Subject: [PATCH] QtSupport: Remove internal class QtFeatureProvider from
public header.
Add header and remove export, since it is apparently not used
elsewhere.
Change-Id: I534152d7d1460a8e8f51f650d0858edf5aa5f6dd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
src/plugins/madde/maemoqtversion.cpp | 1 +
src/plugins/qnx/blackberryqtversion.cpp | 1 +
src/plugins/qnx/qnxqtversion.cpp | 1 +
.../qt-desktop/desktopqtversion.cpp | 1 +
.../qt-desktop/simulatorqtversion.cpp | 1 +
src/plugins/qtsupport/baseqtversion.cpp | 1 +
src/plugins/qtsupport/baseqtversion.h | 5 +-
src/plugins/qtsupport/qtfeatureprovider.h | 52 +++++++++++++++++++
src/plugins/qtsupport/qtkitinformation.h | 1 +
src/plugins/qtsupport/qtsupport.pro | 3 +-
src/plugins/qtsupport/qtsupport.qbs | 1 +
src/plugins/qtsupport/qtsupportplugin.cpp | 1 +
src/plugins/qtsupport/qtversionmanager.cpp | 2 +
src/plugins/qtsupport/qtversionmanager.h | 15 ------
14 files changed, 69 insertions(+), 17 deletions(-)
create mode 100644 src/plugins/qtsupport/qtfeatureprovider.h
diff --git a/src/plugins/madde/maemoqtversion.cpp b/src/plugins/madde/maemoqtversion.cpp
index ed2b15d8e86..423d2ffee77 100644
--- a/src/plugins/madde/maemoqtversion.cpp
+++ b/src/plugins/madde/maemoqtversion.cpp
@@ -34,6 +34,7 @@
#include <projectexplorer/kitinformation.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qtsupport/qtsupportconstants.h>
+#include <coreplugin/featureprovider.h>
#include <utils/hostosinfo.h>
#include <QCoreApplication>
diff --git a/src/plugins/qnx/blackberryqtversion.cpp b/src/plugins/qnx/blackberryqtversion.cpp
index 03d98241c84..12bd3638791 100644
--- a/src/plugins/qnx/blackberryqtversion.cpp
+++ b/src/plugins/qnx/blackberryqtversion.cpp
@@ -34,6 +34,7 @@
#include "qnxutils.h"
#include "qnxconstants.h"
+#include <coreplugin/featureprovider.h>
#include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index e83a774bb25..97bf4b41b85 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -33,6 +33,7 @@
#include "qnxconstants.h"
+#include <coreplugin/featureprovider.h>
#include <utils/hostosinfo.h>
using namespace Qnx;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index 20d670eb2d6..0d6204c42ed 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
@@ -32,6 +32,7 @@
#include <qtsupport/qtsupportconstants.h>
#include <proparser/profileevaluator.h>
+#include <coreplugin/featureprovider.h>
#include <QCoreApplication>
#include <QDir>
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
index 843f9548565..e98c5dd22c0 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
@@ -32,6 +32,7 @@
#include <qtsupport/qtsupportconstants.h>
#include <proparser/profileevaluator.h>
+#include <coreplugin/featureprovider.h>
#include <QCoreApplication>
#include <QDir>
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 0e48996dff3..a72bdb5a5cc 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -44,6 +44,7 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <qtsupport/debugginghelper.h>
#include <qtsupport/qtsupportconstants.h>
+#include <coreplugin/featureprovider.h>
#include <utils/persistentsettings.h>
#include <utils/environment.h>
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 2b839b7f8c9..2d29e9de077 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -37,7 +37,6 @@
#include <projectexplorer/abi.h>
#include <projectexplorer/headerpath.h>
#include <projectexplorer/task.h>
-#include <coreplugin/featureprovider.h>
#include <QVariantMap>
@@ -45,6 +44,10 @@ namespace Utils {
class Environment;
} // namespace Utils
+namespace Core {
+class FeatureSet;
+} // namespace Core
+
namespace ProjectExplorer {
class IOutputParser;
class Kit;
diff --git a/src/plugins/qtsupport/qtfeatureprovider.h b/src/plugins/qtsupport/qtfeatureprovider.h
new file mode 100644
index 00000000000..a2fb3435ea9
--- /dev/null
+++ b/src/plugins/qtsupport/qtfeatureprovider.h
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef QTFEATUREPROVIDER_H
+#define QTFEATUREPROVIDER_H
+
+#include <coreplugin/featureprovider.h>
+
+namespace QtSupport {
+namespace Internal {
+
+class QtFeatureProvider : public Core::IFeatureProvider
+{
+ Q_OBJECT
+
+public:
+ QtFeatureProvider() {}
+ Core::FeatureSet availableFeatures(const QString &platformName) const;
+ QStringList availablePlatforms() const;
+ QString displayNameForPlatform(const QString &string) const;
+};
+
+} // namespace Internal
+} // namespace QtSupport
+
+#endif // QTFEATUREPROVIDER_H
diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h
index d88593df078..b4ae29d6f44 100644
--- a/src/plugins/qtsupport/qtkitinformation.h
+++ b/src/plugins/qtsupport/qtkitinformation.h
@@ -34,6 +34,7 @@
#include "baseqtversion.h"
+#include <coreplugin/featureprovider.h>
#include <projectexplorer/kitinformation.h>
namespace QtSupport {
diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro
index 55d2ffb4aae..61b03c2e316 100644
--- a/src/plugins/qtsupport/qtsupport.pro
+++ b/src/plugins/qtsupport/qtsupport.pro
@@ -33,7 +33,8 @@ HEADERS += \
gettingstartedwelcomepage.h \
exampleslistmodel.h \
screenshotcropper.h \
- qtconfigwidget.h
+ qtconfigwidget.h \
+ qtfeatureprovider.h
SOURCES += \
qtsupportplugin.cpp \
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 296451a467d..ef460669f9e 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -97,6 +97,7 @@ QtcPlugin {
"qtversionmanager.cpp",
"qtversionmanager.h",
"qtversionmanager.ui",
+ "qtfeatureprovider.h",
"screenshotcropper.cpp",
"screenshotcropper.h",
"showbuildlog.ui",
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index 01fff203533..f593e2800a5 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -33,6 +33,7 @@
#include "qtoptionspage.h"
#include "qtkitinformation.h"
#include "qtversionmanager.h"
+#include "qtfeatureprovider.h"
#include "profilereader.h"
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 9fd0bbb3bf0..6ef53b1909a 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -31,6 +31,8 @@
#include "qtkitinformation.h"
#include "qtversionfactory.h"
+#include "baseqtversion.h"
+#include "qtfeatureprovider.h"
#include "qtsupportconstants.h"
diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h
index 0701fd42c9f..9542cc1290b 100644
--- a/src/plugins/qtsupport/qtversionmanager.h
+++ b/src/plugins/qtsupport/qtversionmanager.h
@@ -143,21 +143,6 @@ private:
Utils::PersistentSettingsWriter *m_writer;
};
-namespace Internal {
-
-class QTSUPPORT_EXPORT QtFeatureProvider : public Core::IFeatureProvider
-{
- Q_OBJECT
-
-public:
- QtFeatureProvider() {}
- Core::FeatureSet availableFeatures(const QString &platformName) const;
- QStringList availablePlatforms() const;
- QString displayNameForPlatform(const QString &string) const;
-};
-
-}
-
} // namespace QtSupport
#endif // QTVERSIONMANAGER_H
--
GitLab