diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index a74998b05..30eeb98f2 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -18,7 +18,12 @@ TEMPLATE = app # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 5ec62d053..6b4dd3202 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -31,7 +31,12 @@ macx{ # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings diff --git a/src/libs/fervor/fervor.pro b/src/libs/fervor/fervor.pro index ae945cd24..279689cbf 100644 --- a/src/libs/fervor/fervor.pro +++ b/src/libs/fervor/fervor.pro @@ -17,7 +17,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # 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 cb8dc0b61..bb30563d5 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -21,7 +21,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 5a61996d1..d6a600a56 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -19,7 +19,12 @@ TEMPLATE = lib # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings diff --git a/src/libs/vdxf/vdxf.pro b/src/libs/vdxf/vdxf.pro index cdd2d6efe..15b0941ee 100644 --- a/src/libs/vdxf/vdxf.pro +++ b/src/libs/vdxf/vdxf.pro @@ -17,7 +17,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vformat/vformat.pro b/src/libs/vformat/vformat.pro index f284b819a..ac5e65aea 100644 --- a/src/libs/vformat/vformat.pro +++ b/src/libs/vformat/vformat.pro @@ -21,7 +21,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # 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 d125a1745..e922fd0db 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -17,7 +17,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # 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 4827d4241..d5ef7054d 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -17,7 +17,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro index c58e10c37..2de6d832a 100644 --- a/src/libs/vmisc/vmisc.pro +++ b/src/libs/vmisc/vmisc.pro @@ -17,7 +17,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # 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 e66522189..cc73b3964 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -15,7 +15,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # 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 41811a554..49c48e227 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -17,7 +17,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index 781a3db4a..8d532d294 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -19,7 +19,12 @@ TARGET = vpropertyexplorer # We want create library TEMPLATE = lib -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro index b44c6d494..51f8052b0 100644 --- a/src/libs/vtest/vtest.pro +++ b/src/libs/vtest/vtest.pro @@ -17,7 +17,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # 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 44070b93b..91ce3d161 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -17,7 +17,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # 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 86886cc89..c6884838e 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -17,7 +17,12 @@ TEMPLATE = lib CONFIG += staticlib # Making static library -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/test/CollectionTest/CollectionTest.pro b/src/test/CollectionTest/CollectionTest.pro index 9cc7885b2..758dd3179 100644 --- a/src/test/CollectionTest/CollectionTest.pro +++ b/src/test/CollectionTest/CollectionTest.pro @@ -31,7 +31,12 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # Use out-of-source builds (shadow builds) CONFIG -= app_bundle debug_and_release debug_and_release_target diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index c8cd5854c..efc4f77b4 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -21,7 +21,12 @@ TARGET = ParserTest # Console application. CONFIG += console -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # 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. diff --git a/src/test/TranslationsTest/TranslationsTest.pro b/src/test/TranslationsTest/TranslationsTest.pro index 3e4c819f3..fbd74e9d8 100644 --- a/src/test/TranslationsTest/TranslationsTest.pro +++ b/src/test/TranslationsTest/TranslationsTest.pro @@ -29,7 +29,12 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # Use out-of-source builds (shadow builds) CONFIG -= app_bundle debug_and_release debug_and_release_target diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index d1141879a..27d7c8afa 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -27,7 +27,12 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -CONFIG += c++14 +# Since Q5.12 available support for C++17 +equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 11) { + CONFIG += c++17 +} else { + CONFIG += c++14 +} # Use out-of-source builds (shadow builds) CONFIG -= app_bundle debug_and_release debug_and_release_target