OSDN Git Service

[Qt][Build][CMake] Prepare to support Qt6 (maybe later than Qt6.2).
authorK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 16 Jan 2022 16:10:38 +0000 (01:10 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 16 Jan 2022 16:10:38 +0000 (01:10 +0900)
source/cmake/config.cmake

index da91325..8060c5e 100644 (file)
@@ -138,9 +138,14 @@ add_definitions(-DUSE_QT)
 # 20210914 K.O Start to migrate for Qt6.
 # See, https://doc.qt.io/qt-6/portingguide.html
 if(${Qt5Widgets_VERSION_MAJOR} VERSION_GREATER "4")
+  if(${Qt5Widgets_VERSION_MAJOR} VERSION_EQUAL "5")
     if(${Qt5Widgets_VERSION_MINOR} VERSION_GREATER "14")
-        add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
+      add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
     endif()
+  else()
+       #Qt6 or later
+    add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060000)
+  endif()
 endif()
 
 add_definitions(-DQT_MAJOR_VERSION=${Qt5Widgets_VERSION_MAJOR})