diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-08-02 10:57:41 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-08-02 10:18:31 +0000 |
| commit | e8b7cac678652bc2e1b9bcce5d808988a5b86982 (patch) | |
| tree | 60f826d271890e7ac6a0884baeac7564e6fd5348 | |
| parent | 80952f4f23eabcaada0a51e8c9bbf13b72aeb5d3 (diff) | |
| download | qbs-e8b7cac678652bc2e1b9bcce5d808988a5b86982.tar.gz | |
QtScript: set cxx standard to c++17
The code was ported to c++17 so there is no reason to use c++14.
Change-Id: Ie57d660c92f17a6ae1f25ede564b7da494306fe2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/scriptengine/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/lib/scriptengine/scriptengine.pro | 2 | ||||
| -rw-r--r-- | src/lib/scriptengine/scriptengine.qbs | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/scriptengine/CMakeLists.txt b/src/lib/scriptengine/CMakeLists.txt index a30670236..b67f9f52c 100644 --- a/src/lib/scriptengine/CMakeLists.txt +++ b/src/lib/scriptengine/CMakeLists.txt @@ -363,5 +363,4 @@ add_qbs_library(qbsscriptengine ${BRIDGE_SOURCES} ${PARSER_SOURCES} ) -set_property(TARGET qbsscriptengine PROPERTY CXX_STANDARD 14) target_compile_options(qbsscriptengine PRIVATE ${QT_SCRIPT_CXX_FLAGS}) diff --git a/src/lib/scriptengine/scriptengine.pro b/src/lib/scriptengine/scriptengine.pro index df138e624..b1e6e8bad 100644 --- a/src/lib/scriptengine/scriptengine.pro +++ b/src/lib/scriptengine/scriptengine.pro @@ -10,8 +10,6 @@ DEFINES += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qt DEFINES += QT_NO_USING_NAMESPACE CONFIG += building-libs -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 8c4d15232..8183f3bc1 100644 --- a/src/lib/scriptengine/scriptengine.qbs +++ b/src/lib/scriptengine/scriptengine.qbs @@ -28,7 +28,6 @@ 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( ".", |