forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -32,7 +32,9 @@
|
||||
|
||||
#include "simulatorqtversion.h"
|
||||
#include "qt4projectmanagerconstants.h"
|
||||
#include "profileevaluator.h"
|
||||
|
||||
#include <qtsupport/qtsupportconstants.h>
|
||||
#include <proparser/profileevaluator.h>
|
||||
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDir>
|
||||
@@ -42,14 +44,14 @@ using namespace Qt4ProjectManager;
|
||||
using namespace Qt4ProjectManager::Internal;
|
||||
|
||||
SimulatorQtVersion::SimulatorQtVersion()
|
||||
: BaseQtVersion(),
|
||||
: QtSupport::BaseQtVersion(),
|
||||
m_qtAbisUpToDate(false)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
SimulatorQtVersion::SimulatorQtVersion(const QString &path, bool isAutodetected, const QString &autodetectionSource)
|
||||
: BaseQtVersion(path, isAutodetected, autodetectionSource),
|
||||
: QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource),
|
||||
m_qtAbisUpToDate(false)
|
||||
{
|
||||
|
||||
@@ -67,7 +69,7 @@ SimulatorQtVersion *SimulatorQtVersion::clone() const
|
||||
|
||||
QString SimulatorQtVersion::type() const
|
||||
{
|
||||
return Constants::SIMULATORQT;
|
||||
return QtSupport::Constants::SIMULATORQT;
|
||||
}
|
||||
|
||||
bool SimulatorQtVersion::isValid() const
|
||||
|
||||
Reference in New Issue
Block a user