From 1a9593409a208d210b47263439abfdce98232b95 Mon Sep 17 00:00:00 2001
From: jkriege2 <jan@jkrieger.de>
Date: Thu, 12 May 2022 10:35:05 +0200
Subject: [PATCH] fixed QT6 compatibility

---
 examples/contourplot/contourplot.cpp             | 2 +-
 lib/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/contourplot/contourplot.cpp b/examples/contourplot/contourplot.cpp
index 38bee9f170..9e2dacf5c9 100644
--- a/examples/contourplot/contourplot.cpp
+++ b/examples/contourplot/contourplot.cpp
@@ -20,7 +20,7 @@
 int main(int argc, char* argv[])
 {
         
-#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
+#if QT_VERSION >= QT_VERSION_CHECK(5,6,0) && QT_VERSION<QT_VERSION_CHECK(6,0,0)
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps
 #endif
diff --git a/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp b/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp
index 9bd6ea2f76..c0e6f7ae5a 100644
--- a/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp
@@ -292,7 +292,11 @@ void JKQTPGraphFillStyleMixin::initFillStyleInvertedColor(JKQTPGraphFillStyleMix
 {
     if (other) { // get style settings from parent object
         m_fillColor=other->getFillColor();
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+        float h=0,s=0,v=0,a=0;
+#else
         qreal h=0,s=0,v=0,a=0;
+#endif
         m_fillColor.getHsvF(&h, &s, &v, &a);
         h=std::fmod(h+120.0/360.0, 1.0);
         m_fillColor.setHsvF(h,s,v,a);