Commit 30eefea9 authored by Friedemann Kleint's avatar Friedemann Kleint

Header cleanup in QtSupport.

Change-Id: I681bab48aafb029f4869209382493dfa36233a2d
Reviewed-on: http://codereview.qt.nokia.com/3081Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent 7b3ba73a
......@@ -41,6 +41,7 @@
#include <projectexplorer/toolchainmanager.h>
#include <qtsupport/qtsupportconstants.h>
#include <utils/pathchooser.h>
#include <utils/environment.h>
#include <proparser/profileevaluator.h>
#include <QtCore/QCoreApplication>
......
......@@ -45,6 +45,7 @@
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/persistentsettings.h>
#include <utils/environment.h>
#include <utils/synchronousprocess.h>
#include <QtCore/QDir>
......
......@@ -38,10 +38,17 @@
#include <projectexplorer/abi.h>
#include <projectexplorer/headerpath.h>
#include <projectexplorer/task.h>
#include <projectexplorer/ioutputparser.h>
#include <utils/environment.h>
#include <QtCore/QVariantMap>
#include <QtGui/QWidget>
namespace Utils {
class Environment;
} // namespace Utils
namespace ProjectExplorer {
class IOutputParser;
} // namespace ProjectExplorer
QT_BEGIN_NAMESPACE
class ProFileEvaluator;
......
......@@ -39,6 +39,7 @@
#include <coreplugin/messagemanager.h>
#include <projectexplorer/abi.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/debugginghelper.h>
#include <projectexplorer/abi.h>
#include <utils/qtcassert.h>
......
......@@ -41,6 +41,10 @@
#include <QtCore/QFutureInterface>
#include <QtCore/QMetaType>
namespace ProjectExplorer {
class ToolChain;
} // namespace ProjectExplorer
namespace QtSupport {
class BaseQtVersion;
......
......@@ -38,6 +38,7 @@
#include <utils/fileutils.h>
#include <coreplugin/coreplugin.h>
#include <coreplugin/icore.h>
#include <coreplugin/helpmanager.h>
#include <projectexplorer/projectexplorer.h>
......@@ -107,6 +108,11 @@ GettingStartedWelcomePage::GettingStartedWelcomePage()
{
}
QUrl GettingStartedWelcomePage::pageLocation() const
{
return QUrl::fromLocalFile(Core::ICore::instance()->resourcePath() + QLatin1String("/welcomescreen/gettingstarted.qml"));
}
void GettingStartedWelcomePage::facilitateQml(QDeclarativeEngine *engine)
{
m_engine = engine;
......
......@@ -34,10 +34,8 @@
#define GETTINGSTARTEDWELCOMEPLUGIN_H
#include <utils/iwelcomepage.h>
#include <coreplugin/icore.h>
#include <QtGui/QStringListModel>
#include <QtDeclarative/QDeclarativeItem>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE
class QDeclarativeEngine;
......@@ -57,7 +55,7 @@ class GettingStartedWelcomePage : public Utils::IWelcomePage
public:
GettingStartedWelcomePage();
QUrl pageLocation() const { return QUrl::fromLocalFile(Core::ICore::instance()->resourcePath() + QLatin1String("/welcomescreen/gettingstarted.qml")); }
QUrl pageLocation() const;
QString title() const { return tr("Getting Started");}
int priority() const { return 10; }
void facilitateQml(QDeclarativeEngine *);
......
......@@ -39,10 +39,8 @@
using namespace QtSupport;
using ProjectExplorer::Task;
namespace {
// opt. drive letter + filename: (2 brackets)
const char * const FILE_PATTERN = "^(([A-Za-z]:)?[^:]+\\.[^:]+)";
}
// opt. drive letter + filename: (2 brackets)
static const char FILE_PATTERN[] = "^(([A-Za-z]:)?[^:]+\\.[^:]+)";
QtParser::QtParser()
{
......
......@@ -33,6 +33,7 @@
#include "qtversionfactory.h"
#include "profilereader.h"
#include "qtversionmanager.h"
#include "baseqtversion.h"
#include <extensionsystem/pluginmanager.h>
#include <QtCore/QSettings>
......
......@@ -33,14 +33,18 @@
#ifndef QTVERSIONFACTORY_H
#define QTVERSIONFACTORY_H
#include "baseqtversion.h"
#include "qtsupport_global.h"
#include <QtCore/QObject>
#include <QtCore/QVariantMap>
QT_FORWARD_DECLARE_CLASS(QSettings)
QT_FORWARD_DECLARE_CLASS(ProFileEvaluator)
namespace QtSupport {
class BaseQtVersion;
class QTSUPPORT_EXPORT QtVersionFactory : public QObject
{
Q_OBJECT
......
......@@ -36,14 +36,8 @@
#include "qtsupport_global.h"
#include "baseqtversion.h"
#include <projectexplorer/abi.h>
#include <QtCore/QHash>
#include <QtCore/QSet>
#include <QtCore/QSharedPointer>
#include <QtCore/QFutureInterface>
#include <QtCore/QStringList>
#include <QtCore/QVariantMap>
namespace Utils {
class Environment;
......@@ -56,8 +50,6 @@ class Task;
}
namespace QtSupport {
class BaseQtVersion;
namespace Internal {
class QtOptionsPageWidget;
class QtOptionsPage;
......
......@@ -40,6 +40,7 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QFile>
#include <QtCore/QDir>
#include <QtCore/QTextStream>
using namespace Qt4ProjectManager;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment