summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/qmake/testcompiler.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-11-27 14:12:52 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-04 16:33:33 +0000
commited3aca119fc23844e6d00c95f444d0ee3f71ad1e (patch)
tree587f4489de757d043d510c38d6e32c95f2010079 /tests/auto/tools/qmake/testcompiler.h
parent8d71fcabb1d4a9add13fee6b77a8c0d9d05ae3a8 (diff)
make test support qmake path with spaces
Change-Id: I66d8b3cc742c44d02c224bbfc4086500af0d5f4a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tests/auto/tools/qmake/testcompiler.h')
-rw-r--r--tests/auto/tools/qmake/testcompiler.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/tools/qmake/testcompiler.h b/tests/auto/tools/qmake/testcompiler.h
index 5e0d706c68..ee73b6cbb3 100644
--- a/tests/auto/tools/qmake/testcompiler.h
+++ b/tests/auto/tools/qmake/testcompiler.h
@@ -49,7 +49,7 @@ public:
void setBaseCommands( QString makeCmd, QString qmakeCmd );
void resetArguments();
- void setArguments( QString makeArgs, QString qmakeArgs );
+ void setArguments(const QStringList &makeArgs, const QStringList &qmakeArgs);
void resetEnvironment();
void addToEnvironment( QString varAssignment );
@@ -78,11 +78,13 @@ public:
void clearCommandOutput();
private:
- bool runCommand( QString cmdLine, bool expectFail = false );
+ bool runCommand(const QString &cmd, const QStringList &args, bool expectFail = false);
bool errorOut();
- QString makeCmd_, makeArgs_;
- QString qmakeCmd_, qmakeArgs_;
+ QString makeCmd_;
+ QStringList makeArgs_;
+ QString qmakeCmd_;
+ QStringList qmakeArgs_;
QStringList environment_;
QStringList testOutput_;