diff options
author | David Boddie <dboddie@trolltech.com> | 2010-08-24 17:45:21 +0200 |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-08-24 17:45:21 +0200 |
commit | 8e6569663ecbf7389b3df5d86f4ce2d1102b16c0 (patch) | |
tree | 290fe9c4af570126949093affc25c7a9fb84e8ed /src/plugins/qt4projectmanager/qtversionmanager.h | |
parent | 1cbc4116d3c6fa1320ee4523e45a5f0df004cd3a (diff) | |
parent | e5076cc5e50be46b2f2a2307660e5e8603b780ad (diff) | |
download | qt-creator-8e6569663ecbf7389b3df5d86f4ce2d1102b16c0.tar.gz |
Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline into 2.0
Diffstat (limited to 'src/plugins/qt4projectmanager/qtversionmanager.h')
-rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index 6ccacad406..fe4484ce3b 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -30,6 +30,7 @@ #ifndef QTVERSIONMANAGER_H #define QTVERSIONMANAGER_H +#include "qt4projectmanager_global.h" #include <projectexplorer/taskwindow.h> #include <projectexplorer/toolchain.h> #include <QSharedPointer> @@ -45,7 +46,7 @@ class QtOptionsPageWidget; class QtOptionsPage; } -class QtVersion +class QT4PROJECTMANAGER_EXPORT QtVersion { friend class QtVersionManager; public: @@ -70,6 +71,7 @@ public: QString uicCommand() const; QString designerCommand() const; QString linguistCommand() const; + QString qmlviewerCommand() const; bool supportsTargetId(const QString &id) const; QSet<QString> supportedTargetIds() const; @@ -147,7 +149,7 @@ public: /// its symbian setup. /// @return a list of tasks, ordered on severity (errors first, then /// warnings and finally info items. - QList<ProjectExplorer::Task> reportIssues(const QString &proFile); + QList<ProjectExplorer::Task> reportIssues(const QString &proFile, const QString &buildDir); private: QList<QSharedPointer<ProjectExplorer::ToolChain> > toolChains() const; @@ -189,6 +191,7 @@ private: mutable QString m_uicCommand; mutable QString m_designerCommand; mutable QString m_linguistCommand; + mutable QString m_qmlviewerCommand; mutable QSet<QString> m_targetIds; }; @@ -199,7 +202,7 @@ struct QMakeAssignment QString value; }; -class QtVersionManager : public QObject +class QT4PROJECTMANAGER_EXPORT QtVersionManager : public QObject { Q_OBJECT // for getUniqueId(); |