diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-23 15:35:04 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 20:52:45 +0100 |
| commit | edde6152094702aa4c3415920d2c962009619743 (patch) | |
| tree | 3fd27faa9df153c80a01f9f8a45c2cf9f97b68ab /tests/auto/tools/qmake/testcompiler.h | |
| parent | 091dd54a6c145c477ade2b910519fc4d6d0e3591 (diff) | |
TestCompiler: split commands from arguments
this allows us to temporarily set some extra args without (incorrectly)
instantiating a second TestCompiler (and on the way relying on $PATH for
finding qmake).
Change-Id: Icce5bf7314148ddbe705606f77a26e3362b31f67
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tests/auto/tools/qmake/testcompiler.h')
| -rw-r--r-- | tests/auto/tools/qmake/testcompiler.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/tools/qmake/testcompiler.h b/tests/auto/tools/qmake/testcompiler.h index 116e424551..c438b52db2 100644 --- a/tests/auto/tools/qmake/testcompiler.h +++ b/tests/auto/tools/qmake/testcompiler.h @@ -55,6 +55,10 @@ public: virtual ~TestCompiler(); void setBaseCommands( QString makeCmd, QString qmakeCmd ); + + void resetArguments(); + void setArguments( QString makeArgs, QString qmakeArgs ); + void resetEnvironment(); void addToEnvironment( QString varAssignment ); @@ -78,8 +82,8 @@ public: private: bool runCommand( QString cmdLine ); - QString makeCmd_; - QString qmakeCmd_; + QString makeCmd_, makeArgs_; + QString qmakeCmd_, qmakeArgs_; QStringList environment_; // need to make this available somewhere |