Qt5

.gitignore

@@ -32,3 +32,13 @@ moc_*
 # Auto-generated documentation files
 doc/api/*/*
 
+
+*.dll
+*.exp
+*.lib
+Makefile*
+*.manifest
+*.Release
+*.Debug
+*.exe
+qrc_*.cpp

README

@@ -6,4 +6,6 @@ To compile and run the demo:
 - Create the directory where you want to build the project ("mkdir indigets-build && cd indigets-build")
 - Configure with "cmake <path-to-sources>" from the build directory
 - Compile with "make"
-- Run the demo with the QML Viewer executable ("qmlviewer -I <plugin-build-dir> -I <indigets-dir> <indigets-dir>/demo/examples/demo1.qml")
+
+
+- Run the demo with the QML Viewer executable ("qmlscene -I <plugin-build-dir> -I <indigets-dir> <indigets-dir>/demo/examples/demo1.qml")

demo_gui/demo_gui.pro

@@ -0,0 +1,25 @@
+TEMPLATE = app
+CONFIG += c++11
+
+QT += qml quick
+
+SOURCES += src/main.cpp
+
+CONFIG(debug, debug|release) {
+TARGET = demo_guid
+OBJECTS_DIR = build/debug
+MOC_DIR     = build/debug
+}
+else {
+TARGET = demo_gui
+OBJECTS_DIR = build/release
+MOC_DIR     = build/release
+}
+
+RESOURCES += qml.qrc
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH = ../indigets ./src/qml ../
+
+# Default rules for deployment.
+include(deployment.pri)

demo_gui/deployment.pri

@@ -0,0 +1,27 @@
+android-no-sdk {
+    target.path = /data/user/qt
+    export(target.path)
+    INSTALLS += target
+} else:android {
+    x86 {
+        target.path = /libs/x86
+    } else: armeabi-v7a {
+        target.path = /libs/armeabi-v7a
+    } else {
+        target.path = /libs/armeabi
+    }
+    export(target.path)
+    INSTALLS += target
+} else:unix {
+    isEmpty(target.path) {
+        qnx {
+            target.path = /tmp/$${TARGET}/bin
+        } else {
+            target.path = /opt/$${TARGET}/bin
+        }
+        export(target.path)
+    }
+    INSTALLS += target
+}
+
+export(INSTALLS)

demo_gui/qml.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/main.qml</file>
+        <file>qml/ValueChanger.qml</file>
+    </qresource>
+</RCC>

demo/examples/ValueChanger.qml → demo_gui/qml/ValueChanger.qml

@@ -1,5 +1,5 @@
-import demo 1.0
-import Qt 4.7
+import indigets 1.0
+import QtQuick 2.2
 
 Item {
     property QtObject subject

demo/examples/demo1.qml → demo_gui/qml/main.qml

@@ -1,11 +1,13 @@
+
 import indigets 1.0
-import demo 1.0
-import Qt 4.7
+import QtQuick 2.2
+
+import "../qml"
 
 Rectangle {
     id: root
-    width: 600
-    height: 400
+    width: 800
+    height: 600
 
     gradient: Gradient {
         GradientStop { position: 0.0; color: "#ff525252" }
@@ -25,8 +27,8 @@ Rectangle {
 
             Gauge {
                 id: mainGauge
-                width: 400
-                height: 400
+                width: 200
+                height: 200
 
                 Marker {
                     scale: parent.scale
@@ -346,3 +348,4 @@ Rectangle {
         }
     }
 }
+

demo_gui/src/main.cpp

@@ -0,0 +1,35 @@
+
+#include <QGuiApplication>
+#include <QQuickView>
+#include <QDir>
+#include <QQmlEngine>
+
+int main(int argc, char *argv[])
+{
+    QDir dir(QStringLiteral("../libqt/plugins"));
+    QStringList dirs;
+
+    dirs << QCoreApplication::libraryPaths();
+    dirs << dir.absolutePath();
+
+    dirs << QDir::currentPath() + "/plugins";
+    dirs << QDir::currentPath() ;
+    dirs << "../";
+
+
+    QCoreApplication::setLibraryPaths(dirs);
+    QGuiApplication app(argc, argv);
+
+    QQuickView view;
+    for(const auto& path : dirs)
+        {
+            view.engine()->addPluginPath(path);
+            view.engine()->addImportPath(path);
+        }
+
+    view.setSource(QUrl(QStringLiteral("qrc:/qml/main.qml")));
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
+    view.show();
+
+    return app.exec();
+}

indigets.pro

@@ -0,0 +1,13 @@
+
+
+
+
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS = src \
+    demo_gui
+
+
+OTHER_FILES += \
+    README
+

demo/components/CircularButton.qml → indigets/components/CircularButton.qml

@@ -1,5 +1,5 @@
 import indigets 1.0
-import QtQuick 1.0
+import QtQuick 2.2
 
 Item {
     id: button

demo/components/Field.qml → indigets/components/Field.qml

@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.2
 
 TextInput {
     width: 50

demo/components/Gauge.qml → indigets/components/Gauge.qml

@@ -1,5 +1,5 @@
 import indigets 1.0
-import QtQuick 1.0
+import QtQuick 2.2
 
 Item {
     id: gauge

demo/components/Label.qml → indigets/components/Label.qml

@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.2
 
 Text {
     width: 50

demo/components/Led.qml → indigets/components/Led.qml

@@ -1,5 +1,5 @@
 import indigets 1.0
-import QtQuick 1.0
+import QtQuick 2.2
 
 Item {
     property bool on: false

demo/components/Marker.qml → indigets/components/Marker.qml

@@ -1,5 +1,5 @@
 import indigets 1.0
-import QtQuick 1.0
+import QtQuick 2.2
 
 Pointer {
     z: scale.z + 1

demo/components/Pointer.qml → indigets/components/Pointer.qml

@@ -1,5 +1,5 @@
 import indigets 1.0
-import QtQuick 1.0
+import QtQuick 2.2
 
 Item {
     id: pointer

demo/components/Rotator.qml → indigets/components/Rotator.qml

@@ -1,5 +1,5 @@
 import indigets 1.0
-import QtQuick 1.0
+import QtQuick 2.2
 
 Item {
     id: rotator

demo/components/Scaler.qml → indigets/components/Scaler.qml

@@ -1,5 +1,5 @@
 import indigets 1.0
-import QtQuick 1.0
+import QtQuick 2.2
 
 Item {
     id: scaler

demo/components/SquareButton.qml → indigets/components/SquareButton.qml

@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.2
 
 Item {
     id: button

demo/components/Tank.qml → indigets/components/Tank.qml

@@ -1,5 +1,5 @@
 import indigets 1.0
-import QtQuick 1.0
+import QtQuick 2.2
 
 Item {
     id: tank

demo/qmldir → indigets/qmldir

@@ -1,3 +1,5 @@
+module indigets
+plugin indigets
 Scaler 1.0 components/Scaler.qml
 Rotator 1.0 components/Rotator.qml
 Marker 1.0 components/Marker.qml

src/abstractscale.cpp

@@ -2,8 +2,8 @@
 #include "valuemapper.hpp"
 #include <QPainter>
 
-AbstractScale::AbstractScale(QDeclarativeItem* parent)
-    : QDeclarativeItem(parent)
+AbstractScale::AbstractScale(QQuickItem* parent)
+    : QQuickItem(parent)
     , m_minimum(0)
     , m_maximum(100)
 {
@@ -55,9 +55,9 @@ void AbstractScale::setMapper(ValueMapper* mapper)
     }
 }
 
-QDeclarativeListProperty<ScaleZone> AbstractScale::zones()
+QQmlListProperty<ScaleZone> AbstractScale::zones()
 {
-    return QDeclarativeListProperty<ScaleZone>(this, m_zones);
+    return QQmlListProperty<ScaleZone>(this, m_zones);
 }
 
 int AbstractScale::zoneCount() const
@@ -110,7 +110,7 @@ double AbstractScale::angleAtValue(double value) const
 
 void AbstractScale::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry)
 {
-    QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
 
     // Discard the path on geometry change
     rebuild();

src/abstractscale.hpp

@@ -1,23 +1,24 @@
 #ifndef ABSTRACTSCALE_HPP
 #define ABSTRACTSCALE_HPP
 
-#include <QDeclarativeItem>
+#include <QQuickItem>
+#include <QPainterPath>
 #include <QPointer>
 
 class ValueMapper;
 class ScaleZone;
 
-class AbstractScale : public QDeclarativeItem
+class AbstractScale : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(double minimum READ minimum WRITE setMinimum NOTIFY minimumChanged)
     Q_PROPERTY(double maximum READ maximum WRITE setMaximum NOTIFY maximumChanged)
     Q_PROPERTY(ValueMapper* mapper READ mapper WRITE setMapper NOTIFY mapperChanged)
-    Q_PROPERTY(QDeclarativeListProperty<ScaleZone> zones READ zones)
+    Q_PROPERTY(QQmlListProperty<ScaleZone> zones READ zones)
     Q_PROPERTY(const QPainterPath& path READ path NOTIFY pathChanged)
 
 public:
-    AbstractScale(QDeclarativeItem* parent = 0);
+    AbstractScale(QQuickItem* parent = 0);
 
     double minimum() const;
     void setMinimum(double minimum);
@@ -28,7 +29,7 @@ class AbstractScale : public QDeclarativeItem
     ValueMapper* mapper() const;
     void setMapper(ValueMapper* mapper);
 
-    QDeclarativeListProperty<ScaleZone> zones();
+    QQmlListProperty<ScaleZone> zones();
     int zoneCount() const;
     ScaleZone* zone(int index) const;
 

src/circularscale.cpp

@@ -1,6 +1,6 @@
 #include "circularscale.hpp"
 
-CircularScale::CircularScale(QDeclarativeItem* parent)
+CircularScale::CircularScale(QQuickItem* parent)
     : AbstractScale(parent)
     , m_startAngle(215)
     , m_spanAngle(250)

src/circularscale.hpp

@@ -10,7 +10,7 @@ class CircularScale : public AbstractScale
     Q_PROPERTY(double spanAngle READ spanAngle WRITE setSpanAngle NOTIFY spanAngleChanged)
 
 public:
-    CircularScale(QDeclarativeItem* parent = 0);
+    CircularScale(QQuickItem* parent = 0);
 
     double startAngle() const;
     void setStartAngle(double angle);

src/ellipse.cpp

@@ -1,15 +1,16 @@
 #include "ellipse.hpp"
 #include <QPainter>
 
-Ellipse::Ellipse(QDeclarativeItem* parent)
-    : QDeclarativeItem(parent)
+Ellipse::Ellipse(QQuickItem* parent)
+    : QQuickPaintedItem(parent)
     , m_borderWidth(0.)
 {
-    // need to disable this flag to draw inside a QDeclarativeItem
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
+    //FIXME: diasble flags settings ?
+    // need to disable this flag to draw inside a QQuickItem
+    //setFlag(QGraphicsItem::ItemHasNoContents, false);
 
     // need to disable this flag to receive geometry change events (used to discard the path cache)
-    setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+    //setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
 }
 
 QColor Ellipse::color() const
@@ -57,11 +58,8 @@ void Ellipse::setBorderWidth(double width)
     }
 }
 
-void Ellipse::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
+void Ellipse::paint(QPainter* painter)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
-
     // Rebuild the path if necessary
     if (m_path.isEmpty())
     {
@@ -80,9 +78,9 @@ void Ellipse::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, Q
     painter->drawPath(m_path);
 }
 
-QVariant Ellipse::itemChange(GraphicsItemChange change, const QVariant& value)
+void Ellipse::itemChange(ItemChange change, const ItemChangeData& value)
 {
     // Discard the path on geometry change
     m_path = QPainterPath();
-    return QDeclarativeItem::itemChange(change, value);
+    QQuickItem::itemChange(change, value);
 }