From 7caf42cf48aadc39277a71c81b1d90f80e859c13 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 23 Dec 2018 20:27:24 +0200 Subject: [PATCH] Since Q5.4 available support C++14. Some libraries still missed use. --HG-- branch : develop --- src/libs/fervor/fervor.pro | 12 +++++++++--- src/libs/ifc/ifc.pro | 12 +++++++++--- src/libs/vdxf/vdxf.pro | 5 ++--- src/libs/vformat/vformat.pro | 12 +++++++++--- src/libs/vgeometry/vgeometry.pro | 12 +++++++++--- src/libs/vlayout/vlayout.pro | 12 +++++++++--- src/libs/vobj/vobj.pro | 12 +++++++++--- src/libs/vpatterndb/vpatterndb.pro | 12 +++++++++--- src/libs/vtools/vtools.pro | 12 +++++++++--- src/libs/vwidgets/vwidgets.pro | 12 +++++++++--- src/test/ParserTest/ParserTest.pro | 12 ++++++++++-- 11 files changed, 93 insertions(+), 32 deletions(-) diff --git a/src/libs/fervor/fervor.pro b/src/libs/fervor/fervor.pro index 7da808e82..8a7aadc12 100644 --- a/src/libs/fervor/fervor.pro +++ b/src/libs/fervor/fervor.pro @@ -15,9 +15,15 @@ TARGET = fervor # We want to create a library TEMPLATE = lib -CONFIG += \ - staticlib \# Making static library - c++11 # We use C++11 standard +CONFIG += staticlib # Making static library + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index c0a7766a2..50fbfdf9e 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -19,9 +19,15 @@ TARGET = ifc # Internal Format Converter # We want create library TEMPLATE = lib -CONFIG += \ - staticlib \# Making static library - c++11 # We use C++11 standard +CONFIG += staticlib # Making static library + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vdxf/vdxf.pro b/src/libs/vdxf/vdxf.pro index 92e6d5942..22b8a00dd 100644 --- a/src/libs/vdxf/vdxf.pro +++ b/src/libs/vdxf/vdxf.pro @@ -15,10 +15,9 @@ TARGET = vdxf # We want create a library TEMPLATE = lib -CONFIG += \ - staticlib # Making static library +CONFIG += staticlib # Making static library -# Since Qt5.4 available support C++14 +# Since Q5.4 available support C++14 greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { CONFIG += c++14 } else { diff --git a/src/libs/vformat/vformat.pro b/src/libs/vformat/vformat.pro index 153494020..b284aef80 100644 --- a/src/libs/vformat/vformat.pro +++ b/src/libs/vformat/vformat.pro @@ -19,9 +19,15 @@ TARGET = vformat # We want create a library TEMPLATE = lib -CONFIG += \ - staticlib \# Making static library - c++11 # We use C++11 standard +CONFIG += staticlib # Making static library + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index a9f3bb0ab..77e1a149c 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -15,9 +15,15 @@ TARGET = vgeometry # We want create a library TEMPLATE = lib -CONFIG += \ - staticlib \# Making static library - c++11 # We use C++11 standard +CONFIG += staticlib # Making static library + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index d5b46d6b8..acf99518e 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -15,9 +15,15 @@ TARGET = vlayout # We want create library TEMPLATE = lib -CONFIG += \ - staticlib \# Making static library - c++11 # We use C++11 standard +CONFIG += staticlib # Making static library + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index f57c75f5a..d8a984171 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -13,9 +13,15 @@ TARGET = vobj # We want create a library TEMPLATE = lib -CONFIG += \ - staticlib \# Making static library - c++11 # We use C++11 standard +CONFIG += staticlib # Making static library + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vpatterndb/vpatterndb.pro b/src/libs/vpatterndb/vpatterndb.pro index 1df17d2a6..2e9381294 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -15,9 +15,15 @@ TARGET = vpatterndb # We want create a library TEMPLATE = lib -CONFIG += \ - staticlib \# Making static library - c++11 # We use C++11 standard +CONFIG += staticlib # Making static library + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index bb9fe4815..a5d91f605 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -15,9 +15,15 @@ TARGET = vtools # We want create library TEMPLATE = lib -CONFIG += \ - staticlib \# Making static library - c++11 # We use C++11 standard +CONFIG += staticlib # Making static library + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro index e20521be3..431e99ee9 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -15,9 +15,15 @@ TARGET = vwidgets # We want create a library TEMPLATE = lib -CONFIG += \ - staticlib \# Making static library - c++11 # We use C++11 standard +CONFIG += staticlib # Making static library + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index 2a2e0f3f8..034f53fd0 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -18,8 +18,16 @@ QT -= gui # Name of binary file. TARGET = ParserTest -# Console application, we use C++11 standard. -CONFIG += console c++11 +# Console application. +CONFIG += console + +# Since Q5.4 available support C++14 +greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) { + CONFIG += c++14 +} else { + # We use C++11 standard + CONFIG += c++11 +} # CONFIG += testcase adds a 'make check' which is great. But by default it also # adds a 'make install' that installs the test cases, which we do not want.