diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-28 01:00:07 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-29 09:12:31 +0200 |
| commit | 23f988fe48f3f3c63e8311c31ed09394702089d2 (patch) | |
| tree | feba876785ad8c7404b44bc3e6e12e0837cf902c /tests/auto/shared/util.pri | |
| parent | 3ef2b2727df42510512669ec879788d41d83cebb (diff) | |
| parent | 332e514fb4954fde9af03e1699c066cbbdb0420d (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/compiler/qv4compilercontext.cpp
src/qml/qml/qqmlmetatype.cpp
Change-Id: I02e0216961b92ff68a3f91a70edc33fe9e8db147
Diffstat (limited to 'tests/auto/shared/util.pri')
| -rw-r--r-- | tests/auto/shared/util.pri | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri index a05af4773d..b54897ac2c 100644 --- a/tests/auto/shared/util.pri +++ b/tests/auto/shared/util.pri @@ -3,4 +3,8 @@ INCLUDEPATH += $$PWD HEADERS += $$PWD/util.h SOURCES += $$PWD/util.cpp -DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\" +android|ios { + DEFINES += QT_QMLTEST_DATADIR=\\\":/data\\\" +} else { + DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\" +} |