Skip to content

Commit 27f7689

Browse files
iakovMinyazevR
authored andcommitted
Force c++17 for new Qt's, but c++11 for older compilers and Qt's
For example, in AltLinux GCC does not know about -std=c++2b
1 parent 5ae7a25 commit 27f7689

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

build/common.prf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ isEmpty(PYTHONQT_GENERATED_PATH) {
5555
}
5656

5757
VERSION = 3.2.0
58+
greaterThan(QT_MAJOR_VERSION, 5) | greaterThan(QT_MINOR_VERSION, 9): CONFIG += c++17 c++11
5859
win32: CONFIG += skip_target_version_ext
5960
gcc|win32-clang-msvc:QMAKE_CXXFLAGS += -Wno-deprecated-declarations -Wuninitialized -Winit-self -pedantic
6061
win32-clang-msvc:QMAKE_CXXFLAGS += -Wno-unused-command-line-argument

src/src.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ DEFINES += PYTHONQT_EXPORTS
22

33
INCLUDEPATH += $$PWD
44

5-
CONFIG += c++11
5+
CONFIG += c++11 c++17
66

77
gcc:!no_warn:!clang:QMAKE_CXXFLAGS += -Wno-error=missing-field-initializers
88
*-clang*:!no_warn:QMAKE_CXXFLAGS += -Wno-error=sometimes-uninitialized

0 commit comments

Comments
 (0)