From 2b469da8c3c0cae6ad7ca999eef27aa8268eb794 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Tue, 30 Mar 2021 21:25:01 -0500
Subject: [PATCH] [nostalgia] Make portable between Qt5 and Qt6

---
 src/nostalgia/CMakeLists.txt              | 4 ++--
 src/nostalgia/core/studio/CMakeLists.txt  | 4 ++--
 src/nostalgia/studio/CMakeLists.txt       | 2 +-
 src/nostalgia/studio/lib/CMakeLists.txt   | 2 +-
 src/nostalgia/studio/main.cpp             | 2 ++
 src/nostalgia/world/studio/CMakeLists.txt | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/nostalgia/CMakeLists.txt b/src/nostalgia/CMakeLists.txt
index 55c8dc7f..9389cc04 100644
--- a/src/nostalgia/CMakeLists.txt
+++ b/src/nostalgia/CMakeLists.txt
@@ -3,8 +3,8 @@
 
 if(NOSTALGIA_BUILD_TYPE STREQUAL "Native")
 	if(NOSTALGIA_BUILD_STUDIO)
-		find_package(Qt6Widgets REQUIRED)
-		find_package(Qt6QuickWidgets REQUIRED)
+		find_package(QT NAMES Qt6 Qt5 COMPONENTS QuickWidgets Widgets REQUIRED)
+		find_package(Qt${QT_VERSION_MAJOR} COMPONENTS QuickWidgets Widgets REQUIRED)
 	endif()
 endif()
 
diff --git a/src/nostalgia/core/studio/CMakeLists.txt b/src/nostalgia/core/studio/CMakeLists.txt
index c4800466..22f207f6 100644
--- a/src/nostalgia/core/studio/CMakeLists.txt
+++ b/src/nostalgia/core/studio/CMakeLists.txt
@@ -21,8 +21,8 @@ endif()
 
 target_link_libraries(
 	NostalgiaCore-Studio
-		Qt6::Core
-		Qt6::QuickWidgets
+		Qt${QT_VERSION_MAJOR}::Core
+		Qt${QT_VERSION_MAJOR}::QuickWidgets
 		NostalgiaStudio
 		NostalgiaCore-Qt
 		NostalgiaCore
diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt
index 48b42387..1c5520a1 100644
--- a/src/nostalgia/studio/CMakeLists.txt
+++ b/src/nostalgia/studio/CMakeLists.txt
@@ -53,7 +53,7 @@ add_executable(
 target_link_libraries(
 	NostalgiaStudioJsonTest
 		OxStd
-		Qt6::Widgets
+		Qt${QT_VERSION_MAJOR}::Widgets
 )
 
 add_test("[nostalgia/studio] NostalgiaStudioJson" NostalgiaStudioJsonTest)
diff --git a/src/nostalgia/studio/lib/CMakeLists.txt b/src/nostalgia/studio/lib/CMakeLists.txt
index 4d56074a..76119099 100644
--- a/src/nostalgia/studio/lib/CMakeLists.txt
+++ b/src/nostalgia/studio/lib/CMakeLists.txt
@@ -17,7 +17,7 @@ target_include_directories(NostalgiaStudio PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
 target_link_libraries(
 	NostalgiaStudio PUBLIC
-		Qt6::Widgets
+		Qt${QT_VERSION_MAJOR}::Widgets
 		OxFS
 		OxClaw
 )
diff --git a/src/nostalgia/studio/main.cpp b/src/nostalgia/studio/main.cpp
index 5eb334ba..a3a9b2f3 100644
--- a/src/nostalgia/studio/main.cpp
+++ b/src/nostalgia/studio/main.cpp
@@ -27,7 +27,9 @@ int main(int argc, char **args) {
 		qdark::load(&app);
 	}
 	// force QtQuick to use OpenGL (https://doc.qt.io/qt-6/quick-changes-qt6.html#changes-to-qquickwidget)
+#if QT_VERSION >= 0x060000
 	QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
+#endif
 	// open window
 	try {
 		MainWindow w(argProfilePath);
diff --git a/src/nostalgia/world/studio/CMakeLists.txt b/src/nostalgia/world/studio/CMakeLists.txt
index 58053cea..2229d476 100644
--- a/src/nostalgia/world/studio/CMakeLists.txt
+++ b/src/nostalgia/world/studio/CMakeLists.txt
@@ -9,8 +9,8 @@ add_library(
 
 target_link_libraries(
 	NostalgiaWorld-Studio
-		Qt6::Core
-		Qt6::Widgets
+		Qt${QT_VERSION_MAJOR}::Core
+		Qt${QT_VERSION_MAJOR}::Widgets
 		NostalgiaStudio
 )