summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qmakestep.h
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@nokia.com>2011-11-25 13:19:58 +0100
committerDaniel Teske <daniel.teske@nokia.com>2011-12-07 15:05:31 +0100
commitf5d428712308bb51eded0a3893bb77ea9652130e (patch)
treed9c24e71507f7f4280375375cadee4db0cf8c015 /src/plugins/qt4projectmanager/qmakestep.h
parentc6936d9e807b2b2177a52ed92d918a3aa2204af7 (diff)
downloadqt-creator-f5d428712308bb51eded0a3893bb77ea9652130e.tar.gz
Use Utils::FileName for various bits in QtVersion
Change-Id: I3afc3a4f2e0dd2671279c2d071779f1d7b277849 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qmakestep.h')
-rw-r--r--src/plugins/qt4projectmanager/qmakestep.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index 131d2d3ece..719f3fcf80 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -34,6 +34,7 @@
#define QMAKESTEP_H
#include "qt4projectmanager_global.h"
+#include <utils/fileutils.h>
#include <projectexplorer/abstractprocessstep.h>
#include <QtCore/QStringList>
@@ -101,7 +102,7 @@ public:
QStringList moreArgumentsAfter();
QStringList parserArguments();
QString userArguments();
- QString mkspec();
+ Utils::FileName mkspec();
void setUserArguments(const QString &arguments);
bool linkQmlDebuggingLibrary() const;
void setLinkQmlDebuggingLibrary(bool enable);
@@ -146,7 +147,7 @@ public:
private slots:
// slots for handling buildconfiguration/step signals
void qtVersionChanged();
- void qtVersionsDumpUpdated(const QString &qmakeCommand);
+ void qtVersionsDumpUpdated(const Utils::FileName &qmakeCommand);
void qmakeBuildConfigChanged();
void userArgumentsChanged();
void linkQmlDebuggingLibraryChanged();