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:
@@ -50,7 +50,7 @@ namespace Utils {
|
||||
class EnvironmentItem;
|
||||
}
|
||||
|
||||
namespace Qt4ProjectManager {
|
||||
namespace QtSupport {
|
||||
class BaseQtVersion;
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
QString viewerArguments() const;
|
||||
QString workingDirectory() const;
|
||||
int qtVersionId() const;
|
||||
Qt4ProjectManager::BaseQtVersion *qtVersion() const;
|
||||
QtSupport::BaseQtVersion *qtVersion() const;
|
||||
|
||||
enum MainScriptSource {
|
||||
FileInEditor,
|
||||
@@ -119,7 +119,7 @@ protected:
|
||||
|
||||
private:
|
||||
void ctor();
|
||||
static bool isValidVersion(Qt4ProjectManager::BaseQtVersion *version);
|
||||
static bool isValidVersion(QtSupport::BaseQtVersion *version);
|
||||
void setQtVersionId(int id);
|
||||
|
||||
static QString canonicalCapsPath(const QString &filePath);
|
||||
|
||||
Reference in New Issue
Block a user