From 54def93b6bb8d259e4e8bb96ca0a2c0d2a2771c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= <cedrik.fuoco@autodesk.com>
Date: Fri, 18 Oct 2024 10:40:15 -0400
Subject: [PATCH] Support Qt5 and Qt6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---
 qtcolortriangle/CMakeLists.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/qtcolortriangle/CMakeLists.txt b/qtcolortriangle/CMakeLists.txt
index 0e7c3227..19986816 100644
--- a/qtcolortriangle/CMakeLists.txt
+++ b/qtcolortriangle/CMakeLists.txt
@@ -14,8 +14,12 @@ SET(_sources
     qtcolortriangle.cpp
 )
 
+IF(RV_VFX_PLATFORM STREQUAL CY2023)
+  SET(_qtcolortriangle_extra_components_ WebEngine XmlPatterns)
+ENDIF()
+
 FIND_PACKAGE(
-  Qt5
+  ${RV_QT_PACKAGE_NAME}
   COMPONENTS Core
              Gui
              Network
@@ -27,12 +31,11 @@ FIND_PACKAGE(
              Test
              UiTools
              WebChannel
-             WebEngine
              WebEngineCore
              WebEngineWidgets
              Widgets
              Xml
-             XmlPatterns
+             ${_qtcolortriangle_extra_components_}
   REQUIRED
 )
 
@@ -62,8 +65,8 @@ TARGET_INCLUDE_DIRECTORIES(
 
 TARGET_LINK_LIBRARIES(
   ${_target}
-  PUBLIC Qt5::Gui Qt5::Widgets
-  PRIVATE Qt5::Core
+  PUBLIC Qt::Gui Qt::Widgets
+  PRIVATE Qt::Core
 )
 
 RV_STAGE(TYPE "LIBRARY" TARGET ${_target})