diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-15 01:00:30 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-15 01:00:30 +0200 |
| commit | c5c938055524b8b7e41ad361b0063f9ed1762044 (patch) | |
| tree | 6f2961ef872e33679e02c0d0ef82334381db93f3 /tests/auto/tools/qmake/testcompiler.h | |
| parent | 8bd48a1c335b404ebbeb7c09c859e0715e6b5cd4 (diff) | |
| parent | 0d024bd0a63fa7a741f4f118a3b48806b695594f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Id7954ada1f8658d3b1da5e8241a09f2d201a7c56
Diffstat (limited to 'tests/auto/tools/qmake/testcompiler.h')
| -rw-r--r-- | tests/auto/tools/qmake/testcompiler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/tools/qmake/testcompiler.h b/tests/auto/tools/qmake/testcompiler.h index 50232669c0..e22a2c6c3d 100644 --- a/tests/auto/tools/qmake/testcompiler.h +++ b/tests/auto/tools/qmake/testcompiler.h @@ -60,6 +60,8 @@ public: // executes a qmake on proName in the specified workDir, output goes to buildDir or workDir if it's null bool qmake(const QString &workDir, const QString &proName, const QString &buildDir = QString(), const QStringList &additionalArguments = QStringList()); + // executes qmake in workDir with the specified arguments + bool qmake(const QString &workDir, const QStringList &arguments); // executes a make in the specified workPath, with an optional target (eg. install) bool make( const QString &workPath, const QString &target = QString(), bool expectFail = false ); // checks if the executable exists in destDir |