From 29b8f5d3703e9c830b02905c539ecfd87c0df9c7 Mon Sep 17 00:00:00 2001 From: Kjell Morgenstern Date: Thu, 24 Oct 2019 12:34:44 +0200 Subject: [PATCH] Enable C++14 and add a quick check --- phoenix.pro | 2 ++ test/version.pri | 18 ++++++++++++++++++ test/version/cppversion.cpp | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 test/version.pri create mode 100644 test/version/cppversion.cpp diff --git a/phoenix.pro b/phoenix.pro index 748fe4693..dfb8c195c 100644 --- a/phoenix.pro +++ b/phoenix.pro @@ -27,6 +27,7 @@ lessThan(QT_MINOR_VERSION, 9) { } CONFIG += debug_and_release +CONFIG += c++14 unix:!macx { CONFIG += link_pkgconfig @@ -196,6 +197,7 @@ include(pri/sketch.pri) include(pri/translations.pri) include(pri/program.pri) include(pri/qtsysteminfo.pri) +include(test/version.pri) contains(DEFINES, QUAZIP_INSTALLED) { !build_pass:message("using installed QuaZIP library") diff --git a/test/version.pri b/test/version.pri new file mode 100644 index 000000000..f85c1a134 --- /dev/null +++ b/test/version.pri @@ -0,0 +1,18 @@ +# /******************************************************************* +# Part of the Fritzing project - http://fritzing.org +# Copyright (c) 2007-2019 Fritzing +# Fritzing is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# Fritzing is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with Fritzing. If not, see . +# ********************************************************************/ + + +SOURCES += \ + test/version/cppversion.cpp diff --git a/test/version/cppversion.cpp b/test/version/cppversion.cpp new file mode 100644 index 000000000..6be29930e --- /dev/null +++ b/test/version/cppversion.cpp @@ -0,0 +1,19 @@ +#include + +/* + A quick compile test to verify that certain C++ features are supported + */ + +template +constexpr T pi = T(3.1415926535897932385); + +void testCppVersion() { + int i = 1; + int& r = i; + auto ar = r; // int, nicht: int& + decltype(r) dr = r; // int& C++11/14 + decltype(auto) dra = r; // int& C++14 + + + std::cout << 0b0001'0000'0001; +} \ No newline at end of file