diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:08:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:09:33 +0200 |
commit | 9419dfe8ee45d08f09c09d3cbece511d721546f0 (patch) | |
tree | 1c4584099fc1efb8de30cc4526ce7ebafe8a8ce9 /tests/auto/corelib | |
parent | 8b5aa7b6c40d70a7ec15b3ea485f28a142fb247c (diff) | |
parent | 8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST | 1 | ||||
-rw-r--r-- | tests/auto/corelib/io/largefile/largefile.pro | 2 | ||||
-rw-r--r-- | tests/auto/corelib/io/largefile/tst_largefile.cpp | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST b/tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST index e11e4ae6fb..36b777de34 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST @@ -2,3 +2,4 @@ windows [finishWithUncontrolledAnimation] windows +macos-10.12 diff --git a/tests/auto/corelib/io/largefile/largefile.pro b/tests/auto/corelib/io/largefile/largefile.pro index 6c1bb8d7ea..e96d1398ca 100644 --- a/tests/auto/corelib/io/largefile/largefile.pro +++ b/tests/auto/corelib/io/largefile/largefile.pro @@ -2,3 +2,5 @@ CONFIG += testcase TARGET = tst_largefile QT = core testlib SOURCES = tst_largefile.cpp +INCLUDEPATH += ../../../../shared/ +HEADERS += ../../../../shared/emulationdetector.h diff --git a/tests/auto/corelib/io/largefile/tst_largefile.cpp b/tests/auto/corelib/io/largefile/tst_largefile.cpp index a19a5ce58d..4e7877253f 100644 --- a/tests/auto/corelib/io/largefile/tst_largefile.cpp +++ b/tests/auto/corelib/io/largefile/tst_largefile.cpp @@ -47,6 +47,8 @@ # endif #endif // Q_OS_WIN +#include "emulationdetector.h" + class tst_LargeFile : public QObject { @@ -68,6 +70,10 @@ public: #else maxSizeBits = 24; // 16 MiB #endif + + // QEMU only supports < 4GB files + if (EmulationDetector::isRunningArmOnX86()) + maxSizeBits = qMin(maxSizeBits, 28); } private: |