diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-31 19:41:38 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-31 20:33:42 +0100 |
| commit | 44f24c43ad6af8784314d22f5261094a742458a3 (patch) | |
| tree | 1a5d2ac0f7c94f42421d90447210b86b2a7e0471 /tests/auto/qml/ecmascripttests | |
| parent | b817204f1acc93dffaf3337cf69169ac87cee691 (diff) | |
Prospective workaround for accidental c++11 build with 10.14
When switching to macOS 10.14 and the xcode we install there,
mysteriously qtbase switches from c++17 to c++11 when compiling the
tests, which breaks this particular test as it includes
qv4arraydata_p.h, which in turn requires C++14's std::aligned_storage_t.
Once we enforce C++17 in qtbase this should not be needed anymore, but
we can only enforce that once we've switched to macOS 10.14.
Change-Id: Iaa2b55dfd2bfd23f908a211ca90255ef522bc6ff
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/qml/ecmascripttests')
| -rw-r--r-- | tests/auto/qml/ecmascripttests/qjstest/qjstest.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/ecmascripttests/testcase.pro | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qml/ecmascripttests/qjstest/qjstest.pro b/tests/auto/qml/ecmascripttests/qjstest/qjstest.pro index 6dec5f8f23..adead821e4 100644 --- a/tests/auto/qml/ecmascripttests/qjstest/qjstest.pro +++ b/tests/auto/qml/ecmascripttests/qjstest/qjstest.pro @@ -3,6 +3,8 @@ TARGET = qjstest QT += qml-private INCLUDEPATH += . +CONFIG += c++14 + DEFINES += QT_DEPRECATED_WARNINGS HEADERS += test262runner.h diff --git a/tests/auto/qml/ecmascripttests/testcase.pro b/tests/auto/qml/ecmascripttests/testcase.pro index 5bf7ecd696..9405095050 100644 --- a/tests/auto/qml/ecmascripttests/testcase.pro +++ b/tests/auto/qml/ecmascripttests/testcase.pro @@ -6,6 +6,8 @@ SOURCES += tst_ecmascripttests.cpp qjstest/test262runner.cpp HEADERS += qjstest/test262runner.h DEFINES += SRCDIR=\\\"$$PWD\\\" +CONFIG += c++14 + # The ES test suite takes approximately 5 mins to run, on a fairly # vanilla developer machine, so the default watchdog timer kills the # test some of the time. Fix by raising time-out to 400s when |