diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-10-12 12:06:38 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-10-13 09:13:59 +0000 |
| commit | c7701a6a84dec6480e11cd4952e3da73204fd8d8 (patch) | |
| tree | 384b3d77d9f6bc4802b48ca4a6b2eefe58f8cd60 | |
| parent | cf155e89d1dc8269791f52c431cf6fb7ecdb22f8 (diff) | |
Force C++14 to keep QtScript compilable
Change-Id: I239eb88f52eef6c6733f02a9d3b372999a9195de
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/scriptengine/scriptengine.pro | 2 | ||||
| -rw-r--r-- | src/lib/scriptengine/scriptengine.qbs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/scriptengine/scriptengine.pro b/src/lib/scriptengine/scriptengine.pro index c5ad5f07a..41e2e0262 100644 --- a/src/lib/scriptengine/scriptengine.pro +++ b/src/lib/scriptengine/scriptengine.pro @@ -11,6 +11,8 @@ DEFINES += QT_NO_USING_NAMESPACE CONFIG += building-libs CONFIG += staticlib +CONFIG -= c++17 +CONFIG += c++14 GENERATED_SOURCES_DIR = generated diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs index 88263845f..660b64a82 100644 --- a/src/lib/scriptengine/scriptengine.qbs +++ b/src/lib/scriptengine/scriptengine.qbs @@ -23,7 +23,7 @@ Project { property bool useSystemMalloc: !qbs.targetOS.contains("macos") && !qbs.targetOS.contains("unix") property string qtscriptPath: "../../shared/qtscript/src/" - + cpp.cxxLanguageVersion: "c++14" cpp.includePaths: { var result = base.concat( ".", |