diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-07-06 16:43:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-07-06 16:43:39 +0200 |
| commit | 770b07f71cd4574b4b2f920502c859d7c1591993 (patch) | |
| tree | 03278ab22d52329d525dcbd67f6116c96a9f74d2 /tests/auto | |
| parent | 1de74cceab7f43a57c8ff83bb2a12280c4cfebb0 (diff) | |
| parent | 5671b3a7be0eeb94fa5fd273e1e23cd362647335 (diff) | |
Merge remote-tracking branch 'origin/4.13'
Change-Id: I0125351c7c6fa33f9fc7171469493e4fa53e87c4
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/debugger/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/sdktool/sdktool.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/debugger/CMakeLists.txt b/tests/auto/debugger/CMakeLists.txt index 367a0de393..794c43bdc6 100644 --- a/tests/auto/debugger/CMakeLists.txt +++ b/tests/auto/debugger/CMakeLists.txt @@ -7,7 +7,7 @@ add_qtc_test(tst_debugger_disassembler "${DEBUGGERDIR}/disassemblerlines.cpp" "${DEBUGGERDIR}/disassemblerlines.h" ) -option(WITH_DEBUGGER_DUMPERS "Include tests for debugger pretty printers" OFF) +option(WITH_DEBUGGER_DUMPERS "Include tests for debugger pretty printers" ON) if (WITH_DEBUGGER_DUMPERS) add_qtc_test(tst_debugger_dumpers TIMEOUT 0 diff --git a/tests/auto/sdktool/sdktool.qbs b/tests/auto/sdktool/sdktool.qbs index b7928c7487..c69491d198 100644 --- a/tests/auto/sdktool/sdktool.qbs +++ b/tests/auto/sdktool/sdktool.qbs @@ -10,6 +10,6 @@ QtcAutotest { cpp.defines: base.concat([ 'SDKTOOL_DIR="' + FileInfo.joinPaths(FileInfo.fromNativeSeparators(qbs.installRoot), - qtc.ide_libexec_path) + '"' + qbs.installPrefix, qtc.ide_libexec_path) + '"' ]) } |