diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
| commit | 6a0bb9a7d6a6473920da74bb48c52a4eaed990b0 (patch) | |
| tree | 3a32c56b1fe21c96d5982511e0b4815c1c07dfbb /tests/auto/qml/qv4assembler | |
| parent | f0d23d3ff9da26a71295a6abd356c8d366d17439 (diff) | |
| parent | 2746518c76e02c642ff29faf568de4de90216e58 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a
Diffstat (limited to 'tests/auto/qml/qv4assembler')
| -rw-r--r-- | tests/auto/qml/qv4assembler/tst_qv4assembler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp index 392ce16880..5dd8e9dcc0 100644 --- a/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp +++ b/tests/auto/qml/qv4assembler/tst_qv4assembler.cpp @@ -59,7 +59,7 @@ void tst_QV4Assembler::initTestCase() void tst_QV4Assembler::perfMapFile() { -#if !defined(Q_OS_LINUX) +#if !defined(Q_OS_LINUX) || defined(Q_OS_ANDROID) QSKIP("perf map files are only generated on linux"); #else const QString qmljs = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmljs"; |