Merge branch 'master' into features/arcrenderer

.github/workflows/cmake.yml

@@ -175,7 +175,7 @@ jobs:
             }
           - {
               name: "macOS Latest Clang Qt5",
-              os: macos-latest,
+              os: macos-13,
               artifact: "macos_clang.7z",
               build_type: "Release",
               cc: "clang",
@@ -277,7 +277,8 @@ jobs:
       - name: Install dependencies on macos
         if: startsWith(matrix.config.os, 'macos')
         run: |
-          brew install p7zip cmake ninja
+          find /opt/homebrew/ -name EXTERNALLY-MANAGED|xargs rm
+          brew install cmake ninja
           ninja --version
           cmake --version
 
@@ -322,7 +323,7 @@ jobs:
 
       - name: Install Qt5
         if: endsWith(matrix.config.name, 'Qt5')
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: "5.15.2"
           target: "desktop"
@@ -336,7 +337,7 @@ jobs:
 
       - name: Install Qt6
         if: endsWith(matrix.config.name, 'Qt6')
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: "6.5.0"
           target: "desktop"

src/common/QskGraduation.cpp

@@ -17,8 +17,6 @@ namespace Engine
 {
     // What about using qskFuzzyCompare and friends ???
 
-    const double _eps = 1.0e-6;
-
     inline int fuzzyCompare( double value1, double value2, double intervalSize )
     {
         const double eps = std::abs( 1.0e-6 * intervalSize );

src/common/QskMetaInvokable.cpp

@@ -26,15 +26,6 @@ static void qskRegisterMetaInvokable()
 
 Q_CONSTRUCTOR_FUNCTION( qskRegisterMetaInvokable )
 
-static inline void* qskMetaTypeCreate( int type, const void* copy )
-{
-#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
-    return QMetaType( type ).create( copy );
-#else
-    return QMetaType::create( type, copy );
-#endif
-}
-
 namespace
 {
     using CallFunction = QObjectPrivate::StaticMetaCallFunction;

src/graphic/QskGraphic.cpp

@@ -496,6 +496,16 @@ int QskGraphic::metric( PaintDeviceMetric deviceMetric ) const
             value = metric( PdmDevicePixelRatio ) * devicePixelRatioFScale();
             break;
         }
+#if QT_VERSION >= QT_VERSION_CHECK( 6, 8, 0 )
+        case PdmDevicePixelRatioF_EncodedA:
+        case PdmDevicePixelRatioF_EncodedB:
+        {
+#if 0
+            value = QPaintDevice::encodeMetricF( metric, devicePixelRatio() );
+#endif
+            break;
+        }
+#endif
     }
 
     return value;

src/graphic/QskGraphic.h

@@ -35,6 +35,8 @@ class QSK_EXPORT QskGraphic : public QPaintDevice
     Q_PROPERTY( QSizeF defaultSize READ defaultSize )
     Q_PROPERTY( quint64 modificationId READ modificationId )
 
+    using Inherited = QPaintDevice;
+
   public:
     enum RenderHint
     {