summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qtversionmanager.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qt4projectmanager/qtversionmanager.h')
-rw-r--r--src/plugins/qt4projectmanager/qtversionmanager.h9
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();