making QskGraphic a Q_GADGET

qskinny.pro

@@ -1,5 +1,7 @@
 TEMPLATE = subdirs
 
+CONFIG += ordered
+
 SUBDIRS = \
     src \
     skins \
@@ -21,6 +23,7 @@ OTHER_FILES = \
 qmlexport.depends = src
 inputcontext.depends = src
 skins.depends = src
+tools.depends = src
 support.depends = src skins
 examples.depends = tools support skins qmlexport
 playground.depends = tools support skins qmlexport

src/graphic/QskGraphic.cpp

@@ -1203,3 +1203,5 @@ QDebug operator<<( QDebug debug, const QskGraphic& graphic )
 }
 
 #endif
+
+#include "moc_QskGraphic.cpp"

src/graphic/QskGraphic.h

@@ -26,6 +26,14 @@ class QDebug;
 
 class QSK_EXPORT QskGraphic : public QPaintDevice
 {
+    Q_GADGET
+
+    Q_PROPERTY( qreal aspectRatio READ aspectRatio )
+    Q_PROPERTY( QRectF boundingRect READ boundingRect )
+    Q_PROPERTY( QRectF controlPointRect READ controlPointRect )
+    Q_PROPERTY( QSizeF defaultSize READ defaultSize )
+    Q_PROPERTY( quint64 modificationId READ modificationId )
+
   public:
     enum RenderHint
     {
@@ -122,8 +130,6 @@ class QSK_EXPORT QskGraphic : public QPaintDevice
     uint hash( uint seed ) const;
 
   protected:
-    friend class QskGraphicPaintEngine;
-
     virtual QSize sizeMetrics() const;
 
     virtual void drawPath( const QPainterPath& );
@@ -142,6 +148,8 @@ class QSK_EXPORT QskGraphic : public QPaintDevice
 
     class PrivateData;
     QSharedDataPointer< PrivateData > m_data;
+
+    friend class QskGraphicPaintEngine;
     mutable QskGraphicPaintEngine* m_paintEngine;
 };
 

tools/svg2qvg/svg2qvg.pro

@@ -18,7 +18,7 @@ standalone {
         $${QSK_ROOT}/src/common \
         $${QSK_ROOT}/src/graphic
 
-    INCLUDEPATH *= $${QSK_DIRS}
+    INCLUDEPATH *= $${QSK_DIRS} $${QSK_OUT_ROOT}/src/$${MOC_DIR}
     DEPENDPATH  += $${QSK_DIRS}
 
     DEFINES += QSK_STANDALONE