diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-05 11:08:59 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-05 11:08:59 +0200 |
| commit | 2746518c76e02c642ff29faf568de4de90216e58 (patch) | |
| tree | 822a6d979c13b6450c221b2a45ccfb6674bcb8e4 /tests/auto/qml/qv4assembler/tst_qv4assembler.cpp | |
| parent | 9e32b23a1514f367921b4a9ee25bc864a008463c (diff) | |
| parent | bdf0a46c289298f7378796d62ae5fb283e08657d (diff) | |
| download | qtdeclarative-wip/qt6.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/qt6wip/qt6
Conflicts:
.qmake.conf
src/qml/qml/qqmlengine.cpp
src/qmlmodels/qqmlmodelsmodule.cpp
Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404
Diffstat (limited to 'tests/auto/qml/qv4assembler/tst_qv4assembler.cpp')
| -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"; |