Add support for c++ 20 also with gcc 9

IENT · Jan 14, 2025 · e76e96d · e76e96d
1 parent c2b3392
commit e76e96d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/YUViewApp/YUViewApp.pro b/YUViewApp/YUViewApp.pro
@@ -2,9 +2,14 @@ QT += core gui widgets opengl xml concurrent network
 
 TARGET = YUView
 TEMPLATE = app
-CONFIG += c++20
 CONFIG -= debug_and_release
 
+CONFIG += c++20
+gcc {
+  # For gcc 9, setting 20 does not work. Must set c++2a.
+  equals(QMAKE_GCC_MAJOR_VERSION, 9): QMAKE_CXXFLAGS += -std=c++2a
+}
+
 SOURCES += $$files(src/*.cpp, false)
 HEADERS += $$files(src/*.h, false)
 

diff --git a/YUViewLib/YUViewLib.pro b/YUViewLib/YUViewLib.pro
@@ -2,10 +2,15 @@ QT += core gui widgets opengl xml concurrent network
 
 TEMPLATE = lib
 CONFIG += staticlib
-CONFIG += c++20
 CONFIG -= debug_and_release
 CONFIG += object_parallel_to_source
 
+CONFIG += c++20
+gcc {
+  # For gcc 9, setting 20 does not work. Must set c++2a.
+  equals(QMAKE_GCC_MAJOR_VERSION, 9): QMAKE_CXXFLAGS += -std=c++2a
+}
+
 SOURCES += $$files(src/*.cpp, true)
 HEADERS += $$files(src/*.h, true)
 

diff --git a/YUViewUnitTest/YUViewUnitTest.pro b/YUViewUnitTest/YUViewUnitTest.pro
@@ -6,7 +6,12 @@ TEMPLATE = app
 CONFIG += console
 CONFIG -= app_bundle
 CONFIG -= debug_and_release
+
 CONFIG += c++20
+gcc {
+  # For gcc 9, setting 20 does not work. Must set c++2a.
+  equals(QMAKE_GCC_MAJOR_VERSION, 9): QMAKE_CXXFLAGS += -std=c++2a
+}
 
 SOURCES += $$files(*.cpp, true)
 HEADERS += $$files(*.h, true)