From 7cc2b149b1105195701451ca39871c37083b4bd5 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 30 Apr 2021 16:06:41 +0200
Subject: [PATCH] qbs build: Make ImageViewer build with Qt 6

Change-Id: If934d2df162e043102ba65d9c3de4fb7fc121540
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 qbs/imports/QtcProduct.qbs              | 3 ++-
 src/plugins/imageviewer/imageviewer.qbs | 5 ++---
 src/tools/qml2puppet/qml2puppet.qbs     | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs
index 959ce51bb69..104181657b5 100644
--- a/qbs/imports/QtcProduct.qbs
+++ b/qbs/imports/QtcProduct.qbs
@@ -17,6 +17,7 @@ Product {
             FileInfo.relativePath(FileInfo.joinPaths('/', qtc.ide_qbs_imports_path),
                                   FileInfo.joinPaths('/', qtc.ide_shared_sources_path)))
     property bool sanitizable: true
+    property bool usesQt6: Utilities.versionCompare(Qt.core.version, "6") >= 0
 
     Depends { name: "cpp" }
     Depends { name: "qtc" }
@@ -31,7 +32,7 @@ Product {
     Depends { name: "Qt.core"; versionAtLeast: "5.14.0" }
     Depends {
         name: "Qt.core5compat"
-        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0
+        condition: usesQt6
     }
 
     // TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index fd4bb8433ee..ff6c6f977f0 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -1,16 +1,15 @@
-import qbs 1.0
-
 QtcPlugin {
     name: "ImageViewer"
 
     Depends { name: "Qt.svg"; required: false }
+    Depends { name: "Qt.svgwidgets"; condition: usesQt6; required: false }
     Depends { name: "Qt.widgets" }
     Depends { name: "Utils" }
 
     Depends { name: "Core" }
 
     Properties {
-        condition: !Qt.svg.present
+        condition: !Qt.svg.present || (usesQt6 && !Qt.svgwidgets.present)
         cpp.defines: base.concat("QT_NO_SVG")
     }
 
diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs
index 08d947d14d6..8d7e3edfd48 100644
--- a/src/tools/qml2puppet/qml2puppet.qbs
+++ b/src/tools/qml2puppet/qml2puppet.qbs
@@ -19,8 +19,6 @@ QtcTool {
     property bool useQuick3d: Utilities.versionCompare(Qt.core.version, "5.15") >= 0
                               && Qt["quick3d-private"].present
 
-    property bool useQt5Compat: Utilities.versionCompare(Qt.core.version, "6.0") >= 0
-
     cpp.defines: {
         var defines = base.filter(function(d) { return d != "QT_CREATOR"; });
         if (useQuick3d)
@@ -265,13 +263,13 @@ QtcTool {
 
         Group {
             name: "puppet2 Qt 5 compatibility sources"
-            condition: product.useQt5Compat
+            condition: product.usesQt6
             files: ["editor3d/qt5compat/qquick3darealight.cpp"]
         }
 
         Group {
             name: "puppet2 Qt 5 compatibility headers"
-            condition: product.useQt5Compat
+            condition: product.usesQt6
             files: ["editor3d/qt5compat/qquick3darealight_p.h"]
             fileTags: product.useQuick3d ? [] : ["unmocable"]
             overrideTags: false