diff options
| author | dt <qtc-committer@nokia.com> | 2011-05-20 21:40:53 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2011-05-24 18:35:11 +0200 |
| commit | 754be1bcfcd22e41f591ae78642605f639b075b1 (patch) | |
| tree | a0f0d1f36165bacede673a13ed26904dc04f3970 /src/plugins/qt4projectmanager/qt4projectmanager.cpp | |
| parent | dcd34febabccdcb96fc7963172cba270e20aa483 (diff) | |
| download | qt-creator-754be1bcfcd22e41f591ae78642605f639b075b1.tar.gz | |
Move a lot of qmake independent classes to a new plugin qtsupport
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.
Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4projectmanager.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4projectmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp index 9033891084..c218676150 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp @@ -37,7 +37,6 @@ #include "qt4nodes.h" #include "qt4project.h" #include "qt4target.h" -#include "profilereader.h" #include "profileeditor.h" #include "qmakestep.h" #include "qt4buildconfiguration.h" @@ -58,6 +57,7 @@ #include <projectexplorer/project.h> #include <projectexplorer/projectexplorerconstants.h> #include <utils/qtcassert.h> +#include <qtsupport/profilereader.h> #include <QtCore/QCoreApplication> #include <QtCore/QDir> @@ -192,7 +192,7 @@ void Qt4Manager::updateVariable(const QString &variable) return; } QString value; - BaseQtVersion *qtv = qt4pro->activeTarget()->activeBuildConfiguration()->qtVersion(); + QtSupport::BaseQtVersion *qtv = qt4pro->activeTarget()->activeBuildConfiguration()->qtVersion(); if (qtv) value = qtv->versionInfo().value(QLatin1String("QT_INSTALL_BINS")); Core::VariableManager::instance()->insert(QLatin1String(kInstallBins), value); |