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>
This commit is contained in:
Friedemann Kleint
2013-03-27 08:59:57 +01:00
parent 783e822d94
commit 2fc561ed89
14 changed files with 69 additions and 17 deletions

View File

@@ -34,6 +34,7 @@
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <coreplugin/featureprovider.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <QCoreApplication> #include <QCoreApplication>

View File

@@ -34,6 +34,7 @@
#include "qnxutils.h" #include "qnxutils.h"
#include "qnxconstants.h" #include "qnxconstants.h"
#include <coreplugin/featureprovider.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>

View File

@@ -33,6 +33,7 @@
#include "qnxconstants.h" #include "qnxconstants.h"
#include <coreplugin/featureprovider.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
using namespace Qnx; using namespace Qnx;

View File

@@ -32,6 +32,7 @@
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <proparser/profileevaluator.h> #include <proparser/profileevaluator.h>
#include <coreplugin/featureprovider.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDir> #include <QDir>

View File

@@ -32,6 +32,7 @@
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <proparser/profileevaluator.h> #include <proparser/profileevaluator.h>
#include <coreplugin/featureprovider.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDir> #include <QDir>

View File

@@ -44,6 +44,7 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <qtsupport/debugginghelper.h> #include <qtsupport/debugginghelper.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <coreplugin/featureprovider.h>
#include <utils/persistentsettings.h> #include <utils/persistentsettings.h>
#include <utils/environment.h> #include <utils/environment.h>

View File

@@ -37,7 +37,6 @@
#include <projectexplorer/abi.h> #include <projectexplorer/abi.h>
#include <projectexplorer/headerpath.h> #include <projectexplorer/headerpath.h>
#include <projectexplorer/task.h> #include <projectexplorer/task.h>
#include <coreplugin/featureprovider.h>
#include <QVariantMap> #include <QVariantMap>
@@ -45,6 +44,10 @@ namespace Utils {
class Environment; class Environment;
} // namespace Utils } // namespace Utils
namespace Core {
class FeatureSet;
} // namespace Core
namespace ProjectExplorer { namespace ProjectExplorer {
class IOutputParser; class IOutputParser;
class Kit; class Kit;

View File

@@ -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

View File

@@ -34,6 +34,7 @@
#include "baseqtversion.h" #include "baseqtversion.h"
#include <coreplugin/featureprovider.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
namespace QtSupport { namespace QtSupport {

View File

@@ -33,7 +33,8 @@ HEADERS += \
gettingstartedwelcomepage.h \ gettingstartedwelcomepage.h \
exampleslistmodel.h \ exampleslistmodel.h \
screenshotcropper.h \ screenshotcropper.h \
qtconfigwidget.h qtconfigwidget.h \
qtfeatureprovider.h
SOURCES += \ SOURCES += \
qtsupportplugin.cpp \ qtsupportplugin.cpp \

View File

@@ -97,6 +97,7 @@ QtcPlugin {
"qtversionmanager.cpp", "qtversionmanager.cpp",
"qtversionmanager.h", "qtversionmanager.h",
"qtversionmanager.ui", "qtversionmanager.ui",
"qtfeatureprovider.h",
"screenshotcropper.cpp", "screenshotcropper.cpp",
"screenshotcropper.h", "screenshotcropper.h",
"showbuildlog.ui", "showbuildlog.ui",

View File

@@ -33,6 +33,7 @@
#include "qtoptionspage.h" #include "qtoptionspage.h"
#include "qtkitinformation.h" #include "qtkitinformation.h"
#include "qtversionmanager.h" #include "qtversionmanager.h"
#include "qtfeatureprovider.h"
#include "profilereader.h" #include "profilereader.h"

View File

@@ -31,6 +31,8 @@
#include "qtkitinformation.h" #include "qtkitinformation.h"
#include "qtversionfactory.h" #include "qtversionfactory.h"
#include "baseqtversion.h"
#include "qtfeatureprovider.h"
#include "qtsupportconstants.h" #include "qtsupportconstants.h"

View File

@@ -143,21 +143,6 @@ private:
Utils::PersistentSettingsWriter *m_writer; 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 } // namespace QtSupport
#endif // QTVERSIONMANAGER_H #endif // QTVERSIONMANAGER_H