HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2052:7140e4975cd3

Qt5: declarative fix part1...

Marek Rosa -

r2052:7140e4975cd3

parent child

Context file:

r2052:7140e4975cd3

Collapse all files

charts.pro +2 -1

             !include(config.pri) {
                 error('Missing config.pri')
             }
             TEMPLATE = subdirs
-            SUBDIRS = src plugins examples demos tests
+            SUBDIRS = src plugins
+            #examples demos tests
             development_build: message('Development build')
             CONFIG += ordered
             QMAKE_CXXFLAGS += -g -Wall
             unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
             win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
             # install feature file
             feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
             feature.files = $$PWD/features/qtcommercialchart.prf
             INSTALLS += feature
             docs.target = docs
             win32:{
                 docs.commands = qdoc3 $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
             }else{
                 docs.commands = qdoc3 $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
             }
             docs.depends = FORCE
             QMAKE_EXTRA_TARGETS += docs
             unix:coverage:{
                 QMAKE_DISTCLEAN += -r ./coverage
                 QMAKE_CLEAN += build/*.gcda build/*.gcno
                 QMAKE_EXTRA_TARGETS +=  buildcoverage runcoverage gencoverage
                 buildcoverage.target = build_coverage
                 buildcoverage.depends = all
                 buildcoverage.commands = mkdir -p ./coverage; \
                                          make -C src prepare_coverage;
                 runcoverage.target = run_coverage
                 runcoverage.depends = buildcoverage
                 runcoverage.commands = for f in `ls ./bin/tst_*` ; do echo "processing \$\$f test..."; \$\$f >> unit.log; done ; exit 0;
                 gencoverage.target = gen_coverage
                 gencoverage.depends = runcoverage
                 gencoverage.commands =  make -C src gen_coverage; \
                                         genhtml  -o ./coverage ./coverage/coverage.info --prefix $$PWD
             }

config.pri +2 0

             ##################### LIB #################################################
             LIBRARY_NAME = QtCommercialChart
             CONFIG(debug, debug|release) {
                 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
                 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
             }
             LIBS += -l$$LIBRARY_NAME
             # This will undefine Q_DECL_EXPORT/Q_DECL_IMPORT at qchartglobal.h
             # They should not be used for staticlib builds.
             staticlib:DEFINES+=QTCOMMERCIALCHART_STATICLIB
             #################### COVERAGE #################################################################
             coverage: CONFIG += debug
             ##################### SHADOW CONFIG #################################################
             !contains($${PWD}, $${OUT_PWD}){
                 search = "$$PWD:::"
                 temp = $$split(search,"/")
                 temp = $$last(temp)
                 path = $$replace(search,$$temp,'')
                 temp = $$split(OUT_PWD,$$path)
                 temp = $$split(temp,'/')
                 temp = $$first(temp)
                 path = "$${path}$${temp}"
                 SHADOW=$$path
             }else{
                 SHADOW=$$PWD
                 CONFIG-=development_build
             }
             ##################### BUILD PATHS ##################################################
             CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
             CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
             CHART_BUILD_LIB_DIR = $$SHADOW/lib
             CHART_BUILD_DIR = $$SHADOW/build
             CHART_BUILD_BIN_DIR = $$SHADOW/bin
             CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR
             CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
             CHART_BUILD_DOC_DIR = $$SHADOW/doc
             CONFIG(release,debug|release){
                 CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/release
                 CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/release
                 CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/release/QtCommercial/Chart
                 CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
             }
             CONFIG(debug,debug|release){
                CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/debug
                CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/debug
                CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/debug/QtCommercial/Chart
                CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
             }
             # Use own folders for debug and release builds
             CONFIG(debug, debug|release):CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/debug)
             CONFIG(release, debug|release): CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/release)
             win32:{
                 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
                 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
                 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
                 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
                 CHART_BUILD_QML_PLUGIN_DIR = $$replace(CHART_BUILD_QML_PLUGIN_DIR, "/","\\")
                 CHART_BUILD_DESIGNER_PLUGIN_DIR = $$replace(CHART_BUILD_DESIGNER_PLUGIN_DIR, "/","\\")
                 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
                 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
             }
             mac: {
                 # Some Qt versions use an incompatible configuration on OSX which makes the build fail.
                 # As a work-around, set the minimum OSX version to 10.5.
                 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
                 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
             }
             linux-arm*: {
                 DEFINES+=QT_ON_ARM
             }
+            greaterThan(QT_MAJOR_VERSION, 4): DEFINES += QT5_QUICK_1
             ##################### INCLUDES ############################################################
             INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
             !win32: {
                 LIBS += -L$$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
             } else {
                 win32-msvc*: {
                     # hack fix for error:
                     #   "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
                     QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
                 } else {
                     LIBS += -L$$CHART_BUILD_LIB_DIR
                 }
             }
             ##################### DEVELOPMENT BUILD ###################################################
             development_build: {
                 DEFINES+=DEVELOPMENT_BUILD
                 CONFIG+=debug_and_release
                 CONFIG+=build_all
             }
             ##################### UNIT TESTS ##############################################################
             CONFIG(debug, debug|release) {
                 DEFINES+=BUILD_PRIVATE_UNIT_TESTS
             }

plugins/declarative/declarativebarseries.h +7 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVEBARSERIES_H
             #define DECLARATIVEBARSERIES_H
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qhorizontalbarseries.h"
             #include "qhorizontalstackedbarseries.h"
             #include "qhorizontalpercentbarseries.h"
             #include "qbarset.h"
-            #include <QDeclarativeItem>
+            #ifdef QT5_QUICK_1
-            #include <QDeclarativeParserStatus>
+                #include <QtQuick1/QDeclarativeItem>
+                #include <QtQuick1/QDeclarativeParserStatus>
+            #else
+                #include <QtDeclarative/QDeclarativeItem>
+                #include <QtDeclarative/QDeclarativeParserStatus>
+            #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class DeclarativeBarSet : public QBarSet
             {
                 Q_OBJECT
                 Q_PROPERTY(QVariantList values READ values WRITE setValues)
                 Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
             public:
                 explicit DeclarativeBarSet(QObject *parent = 0);
                 QVariantList values();
                 void setValues(QVariantList values);
                 qreal borderWidth() const;
                 void setBorderWidth(qreal borderWidth);
             public: // From QBarSet
                 Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
                 Q_INVOKABLE void remove(const int index, const int count = 1) { QBarSet::remove(index, count); }
                 Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); }
                 Q_INVOKABLE qreal at(int index) { return QBarSet::at(index); }
             Q_SIGNALS:
                 void countChanged(int count);
                 Q_REVISION(1) void borderWidthChanged(qreal width);
             private Q_SLOTS:
                 void handleCountChanged(int index, int count);
             };
             class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             Q_SIGNALS:
                 Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativeStackedBarSeries : public QStackedBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeStackedBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QStackedBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QStackedBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             Q_SIGNALS:
                 Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativePercentBarSeries : public QPercentBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativePercentBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QPercentBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QPercentBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             Q_SIGNALS:
                 Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeHorizontalBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QHorizontalBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             Q_SIGNALS:
                 Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeHorizontalStackedBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalStackedBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QHorizontalStackedBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             Q_SIGNALS:
                 Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeHorizontalPercentBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalPercentBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QHorizontalPercentBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             Q_SIGNALS:
                 Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEBARSERIES_H

plugins/declarative/declarativecategoryaxis.h +7 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVECATEGORYAXIS_H
             #define DECLARATIVECATEGORYAXIS_H
             #include "qcategoryaxis.h"
-            #include <QDeclarativeParserStatus>
+            #ifdef QT5_QUICK_1
-            #include <QDeclarativeListProperty>
+                #include <QtQuick1/QDeclarativeListProperty>
+                #include <QtQuick1/QDeclarativeParserStatus>
+            #else
+                #include <QtDeclarative/QDeclarativeListProperty>
+                #include <QtDeclarative/QDeclarativeParserStatus>
+            #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeCategoryRange : public QObject
             {
                 Q_OBJECT
                 Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue)
                 Q_PROPERTY(QString label READ label WRITE setLabel)
             public:
                 explicit DeclarativeCategoryRange(QObject *parent = 0);
                 qreal endValue() { return m_endValue; }
                 void setEndValue(qreal endValue) { m_endValue = endValue; }
                 QString label() { return m_label; }
                 void setLabel(QString label) { m_label = label; }
             private:
                 qreal m_endValue;
                 QString m_label;
             };
             class DeclarativeCategoryAxis : public QCategoryAxis, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> axisChildren READ axisChildren)
                 Q_CLASSINFO("DefaultProperty", "axisChildren")
             public:
                 explicit DeclarativeCategoryAxis(QObject *parent = 0);
                 QDeclarativeListProperty<QObject> axisChildren();
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 Q_INVOKABLE void append(const QString &label, qreal categoryEndValue);
                 Q_INVOKABLE void remove(const QString &label);
                 Q_INVOKABLE void replace(const QString& oldLabel, const QString& newLabel);
                 static void appendAxisChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVECATEGORYAXIS_H

plugins/declarative/declarativechart.h +5 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVECHART_H
             #define DECLARATIVECHART_H
             #include <QtCore/QtGlobal>
-            #include <QDeclarativeItem>
+            #ifdef QT5_QUICK_1
+                #include <QtQuick1/QDeclarativeItem>
+            #else
+                #include <QtDeclarative/QDeclarativeItem>
+            #endif
             #include "qchart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeMargins;
             class DeclarativeChart : public QDeclarativeItem
             {
                 Q_OBJECT
                 Q_PROPERTY(Theme theme READ theme WRITE setTheme)
                 Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions)
                 Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont)
                 Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)
                 Q_PROPERTY(QLegend *legend READ legend)
                 Q_PROPERTY(int count READ count)
                 Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
                 Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged)
                 Q_PROPERTY(qreal topMargin READ topMargin)
                 Q_PROPERTY(qreal bottomMargin READ bottomMargin)
                 Q_PROPERTY(qreal leftMargin READ leftMargin)
                 Q_PROPERTY(qreal rightMargin READ rightMargin)
                 Q_PROPERTY(DeclarativeMargins *minimumMargins READ minimumMargins NOTIFY minimumMarginsChanged REVISION 1)
                 Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged REVISION 1)
                 Q_ENUMS(Animation)
                 Q_ENUMS(Theme)
                 Q_ENUMS(SeriesType)
             public:
                 // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api
                 enum Theme {
                     ChartThemeLight = 0,
                     ChartThemeBlueCerulean,
                     ChartThemeDark,
                     ChartThemeBrownSand,
                     ChartThemeBlueNcs,
                     ChartThemeHighContrast,
                     ChartThemeBlueIcy
                 };
                 enum Animation {
                     NoAnimation = 0x0,
                     GridAxisAnimations = 0x1,
                     SeriesAnimations =0x2,
                     AllAnimations = 0x3
                 };
                 enum SeriesType {
                     SeriesTypeLine,
                     SeriesTypeArea,
                     SeriesTypeBar,
                     SeriesTypeStackedBar,
                     SeriesTypePercentBar,
                     SeriesTypePie,
                     SeriesTypeScatter,
                     SeriesTypeSpline,
                     SeriesTypeHorizontalBar,
                     SeriesTypeHorizontalStackedBar,
                     SeriesTypeHorizontalPercentBar
                 };
             public:
                 DeclarativeChart(QDeclarativeItem *parent = 0);
                 ~DeclarativeChart();
             public: // From QDeclarativeItem/QGraphicsItem
                 void childEvent(QChildEvent *event);
                 void componentComplete();
                 void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
             public:
                 void setTheme(DeclarativeChart::Theme theme);
                 DeclarativeChart::Theme theme();
                 void setAnimationOptions(DeclarativeChart::Animation animations);
                 DeclarativeChart::Animation animationOptions();
                 void setTitle(QString title);
                 QString title();
                 QLegend *legend();
                 QFont titleFont() const;
                 void setTitleFont(const QFont& font);
                 void setTitleColor(QColor color);
                 QColor titleColor();
                 void setBackgroundColor(QColor color);
                 QColor backgroundColor();
                 int count();
                 void setDropShadowEnabled(bool enabled);
                 bool dropShadowEnabled();
                 qreal topMargin();
                 qreal bottomMargin();
                 qreal leftMargin();
                 qreal rightMargin();
                 void createDefaultAxes(QAbstractSeries* series);
                 DeclarativeMargins *minimumMargins() { return m_minMargins; }
                 QRectF plotArea() { return m_chart->plotArea(); }
             public:
                 Q_INVOKABLE QAbstractSeries *series(int index);
                 Q_INVOKABLE QAbstractSeries *series(QString seriesName);
                 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
                 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name, QAbstractAxis *axisX, QAbstractAxis *axisY);
                 Q_INVOKABLE void removeSeries(QAbstractSeries *series) { m_chart->removeSeries(series); }
                 Q_INVOKABLE void removeAllSeries() { m_chart->removeAllSeries(); }
                 Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0);
                 Q_INVOKABLE void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0);
                 Q_INVOKABLE void createDefaultAxes();
                 Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0);
                 Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0);
                 Q_INVOKABLE void zoom(qreal factor);
                 Q_INVOKABLE void scrollLeft(qreal pixels);
                 Q_INVOKABLE void scrollRight(qreal pixels);
                 Q_INVOKABLE void scrollUp(qreal pixels);
                 Q_INVOKABLE void scrollDown(qreal pixels);
             Q_SIGNALS:
                 void axisLabelsChanged();
                 void titleColorChanged(QColor color);
                 void backgroundColorChanged();
                 void dropShadowEnabledChanged(bool enabled);
                 void minimumMarginsChanged();
                 void plotAreaChanged(QRectF plotArea);
             public Q_SLOTS:
                 void changeMinimumMargins(int top, int bottom, int left, int right);
                 void handleAxisXSet(QAbstractAxis *axis);
                 void handleAxisYSet(QAbstractAxis *axis);
             private:
                 // Extending QChart with DeclarativeChart is not possible because QObject does not support
                 // multi inheritance, so we now have a QChart as a member instead
                 QChart *m_chart;
                 //QMargins m_chartMargins;
                 DeclarativeMargins *m_minMargins;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVECHART_H

plugins/declarative/declarativelineseries.h +7 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVELINESERIES_H
             #define DECLARATIVELINESERIES_H
             #include "qlineseries.h"
             #include "declarativexyseries.h"
-            #include <QDeclarativeListProperty>
+            #ifdef QT5_QUICK_1
-            #include <QDeclarativeParserStatus>
+                #include <QtQuick1/QDeclarativeListProperty>
+                #include <QtQuick1/QDeclarativeParserStatus>
+            #else
+                #include <QtDeclarative/QDeclarativeListProperty>
+                #include <QtDeclarative/QDeclarativeParserStatus>
+            #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)
                 Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)
                 Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             public:
                 explicit DeclarativeLineSeries(QObject *parent = 0);
                 QXYSeries *xySeries() { return this; }
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 qreal width() const;
                 void setWidth(qreal width);
                 Qt::PenStyle style() const;
                 void setStyle(Qt::PenStyle style);
                 Qt::PenCapStyle capStyle() const;
                 void setCapStyle(Qt::PenCapStyle capStyle);
                 QDeclarativeListProperty<QObject> declarativeChildren();
             public: // from QDeclarativeParserStatus
                 void classBegin() { DeclarativeXySeries::classBegin(); }
                 void componentComplete() { DeclarativeXySeries::componentComplete(); }
             public:
                 Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }
                 Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
                 Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
                 Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }
             Q_SIGNALS:
                 void countChanged(int count);
                 Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void widthChanged(qreal width);
                 Q_REVISION(1) void styleChanged(Qt::PenStyle style);
                 Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
                 void handleCountChanged(int index);
             private:
                 QAbstractAxis *m_axisX;
                 QAbstractAxis *m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVELINESERIES_H

plugins/declarative/declarativepieseries.h +7 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVEPIESERIES_H
             #define DECLARATIVEPIESERIES_H
             #include "qpieseries.h"
-            #include <QDeclarativeItem>
+            #ifdef QT5_QUICK_1
-            #include <QDeclarativeParserStatus>
+                #include <QtQuick1/QDeclarativeItem>
+                #include <QtQuick1/QDeclarativeParserStatus>
+            #else
+                #include <QtDeclarative/QDeclarativeItem>
+                #include <QtDeclarative/QDeclarativeParserStatus>
+            #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSlice;
             class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativePieSeries(QDeclarativeItem *parent = 0);
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE QPieSlice *at(int index);
                 Q_INVOKABLE QPieSlice *find(QString label);
                 Q_INVOKABLE QPieSlice *append(QString label, qreal value);
                 Q_INVOKABLE bool remove(QPieSlice *slice);
                 Q_INVOKABLE void clear();
             public:
                 void classBegin();
                 void componentComplete();
             Q_SIGNALS:
                 void sliceAdded(QPieSlice* slice);
                 void sliceRemoved(QPieSlice* slice);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
                 void handleAdded(QList<QPieSlice*> slices);
                 void handleRemoved(QList<QPieSlice*> slices);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEPIESERIES_H

plugins/declarative/declarativescatterseries.h +7 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVESCATTERSERIES_H
             #define DECLARATIVESCATTERSERIES_H
             #include "qscatterseries.h"
             #include "declarativexyseries.h"
-            #include <QDeclarativeListProperty>
+            #ifdef QT5_QUICK_1
-            #include <QDeclarativeParserStatus>
+                #include <QtQuick1/QDeclarativeListProperty>
+                #include <QtQuick1/QDeclarativeParserStatus>
+            #else
+                #include <QtDeclarative/QDeclarativeListProperty>
+                #include <QtDeclarative/QDeclarativeParserStatus>
+            #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             public:
                 explicit DeclarativeScatterSeries(QObject *parent = 0);
                 QXYSeries *xySeries() { return this; }
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 qreal borderWidth() const;
                 void setBorderWidth(qreal borderWidth);
                 QDeclarativeListProperty<QObject> declarativeChildren();
             public: // from QDeclarativeParserStatus
                 void classBegin() { DeclarativeXySeries::classBegin(); }
                 void componentComplete() { DeclarativeXySeries::componentComplete(); }
             public:
                 Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }
                 Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
                 Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
                 Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }
             Q_SIGNALS:
                 void countChanged(int count);
                 Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void borderWidthChanged(qreal width);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
                 void handleCountChanged(int index);
             private:
                 QAbstractAxis *m_axisX;
                 QAbstractAxis *m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESCATTERSERIES_H

plugins/declarative/declarativesplineseries.h +7 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVESPLINESERIES_H
             #define DECLARATIVESPLINESERIES_H
             #include "qsplineseries.h"
             #include "declarativexyseries.h"
-            #include <QDeclarativeParserStatus>
+            #ifdef QT5_QUICK_1
-            #include <QDeclarativeListProperty>
+                #include <QtQuick1/QDeclarativeListProperty>
+                #include <QtQuick1/QDeclarativeParserStatus>
+            #else
+                #include <QtDeclarative/QDeclarativeListProperty>
+                #include <QtDeclarative/QDeclarativeParserStatus>
+            #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)
                 Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)
                 Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             public:
                 explicit DeclarativeSplineSeries(QObject *parent = 0);
                 QXYSeries *xySeries() { return this; }
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 qreal width() const;
                 void setWidth(qreal width);
                 Qt::PenStyle style() const;
                 void setStyle(Qt::PenStyle style);
                 Qt::PenCapStyle capStyle() const;
                 void setCapStyle(Qt::PenCapStyle capStyle);
                 QDeclarativeListProperty<QObject> declarativeChildren();
             public: // from QDeclarativeParserStatus
                 void classBegin() { DeclarativeXySeries::classBegin(); }
                 void componentComplete() { DeclarativeXySeries::componentComplete(); }
             public:
                 Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }
                 Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
                 Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
                 Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }
             Q_SIGNALS:
                 void countChanged(int count);
                 Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
                 Q_REVISION(1) void widthChanged(qreal width);
                 Q_REVISION(1) void styleChanged(Qt::PenStyle style);
                 Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
                 void handleCountChanged(int index);
             public:
                 QAbstractAxis *m_axisX;
                 QAbstractAxis *m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESPLINESERIES_H

plugins/declarative/plugin.cpp +15 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #include <QtDeclarative/qdeclarativeextensionplugin.h>
+            #ifdef QT5_QUICK_1
-            #include <QtDeclarative/qdeclarative.h>
+                #include <QtQuick1/qdeclarativeextensionplugin.h>
+                #include <QtQuick1/qdeclarative.h>
+            #else
+                #include <QtDeclarative/qdeclarativeextensionplugin.h>
+                #include <QtDeclarative/qdeclarative.h>
+            #endif
             #include "qchart.h"
             #include "qabstractaxis.h"
             #include "qvalueaxis.h"
             #include "declarativecategoryaxis.h"
             #include "qbarcategoryaxis.h"
             #include "declarativechart.h"
             #include "declarativexypoint.h"
             #include "declarativelineseries.h"
             #include "declarativesplineseries.h"
             #include "declarativeareaseries.h"
             #include "declarativescatterseries.h"
             #include "declarativebarseries.h"
             #include "declarativepieseries.h"
             #include "qvxymodelmapper.h"
             #include "qhxymodelmapper.h"
             #include "qhpiemodelmapper.h"
             #include "qvpiemodelmapper.h"
             #include "qhbarmodelmapper.h"
             #include "qvbarmodelmapper.h"
             #include "declarativemargins.h"
             #include <QAbstractItemModel>
             #ifndef QT_ON_ARM
             #include "qdatetimeaxis.h"
             #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartQmlPlugin : public QDeclarativeExtensionPlugin
             {
                 Q_OBJECT
+            #ifdef QT5_QUICK_1
+                Q_PLUGIN_METADATA(IID "org.qt-project.foo")
+            #endif
                 public:
                 virtual void registerTypes(const char *uri)
                 {
                     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
                     // QtCommercial.Chart 1.0
                     qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
                     qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
                     qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
                     qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
                     qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
                     qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
                     qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
                     qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
                     qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
                     qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
                     qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
                                                         QLatin1String("Trying to create uncreatable: Legend."));
                     qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
                                                           QLatin1String("Trying to create uncreatable: XYSeries."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                                    QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
                                                                QLatin1String("Trying to create uncreatable: XYModelMapper."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: BarModelMapper."));
                     qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
                                                                 QLatin1String("Trying to create uncreatable: AbstractSeries."));
                     qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries",
                                                                    QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
                     qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
                                                               QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
                     qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "BarSetBase",
                                                         QLatin1String("Trying to create uncreatable: BarsetBase."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
                                                            QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
                     // QtCommercial.Chart 1.1
                     qmlRegisterType<DeclarativeChart, 1>(uri, 1, 1, "ChartView");
                     qmlRegisterType<DeclarativeXYPoint>(uri, 1, 1, "XYPoint");
                     qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries, 1>(uri, 1, 1, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries, 1>(uri, 1, 1, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries, 1>(uri, 1, 1, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries, 1>(uri, 1, 1, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries, 1>(uri, 1, 1, "PercentBarSeries");
                     qmlRegisterType<DeclarativeHorizontalBarSeries, 1>(uri, 1, 1, "HorizontalBarSeries");
                     qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 1>(uri, 1, 1, "HorizontalStackedBarSeries");
                     qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 1, "PieSlice");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet");
                     qmlRegisterType<QHXYModelMapper>(uri, 1, 1, "HXYModelMapper");
                     qmlRegisterType<QVXYModelMapper>(uri, 1, 1, "VXYModelMapper");
                     qmlRegisterType<QHPieModelMapper>(uri, 1, 1, "HPieModelMapper");
                     qmlRegisterType<QVPieModelMapper>(uri, 1, 1, "VPieModelMapper");
                     qmlRegisterType<QHBarModelMapper>(uri, 1, 1, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 1, 1, "VBarModelMapper");
                     qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
             #ifndef QT_ON_ARM
                     qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis");
             #endif
                     qmlRegisterType<DeclarativeCategoryAxis>(uri, 1, 1, "CategoryAxis");
                     qmlRegisterType<DeclarativeCategoryRange>(uri, 1, 1, "CategoryRange");
                     qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis");
                     qmlRegisterUncreatableType<QLegend>(uri, 1, 1, "Legend",
                                                         QLatin1String("Trying to create uncreatable: Legend."));
                     qmlRegisterUncreatableType<QXYSeries>(uri, 1, 1, "XYSeries",
                                                           QLatin1String("Trying to create uncreatable: XYSeries."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 1, "AbstractItemModel",
                                                                    QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 1, "XYModelMapper",
                                                                QLatin1String("Trying to create uncreatable: XYModelMapper."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 1, "PieModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 1, "BarModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: BarModelMapper."));
                     qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 1, "AbstractSeries",
                                                                 QLatin1String("Trying to create uncreatable: AbstractSeries."));
                     qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 1, "AbstractBarSeries",
                                                                    QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
                     qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 1, "AbstractAxis",
                                                               QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
                     qmlRegisterUncreatableType<QBarSet>(uri, 1, 1, "BarSetBase",
                                                         QLatin1String("Trying to create uncreatable: BarsetBase."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 1, "QPieSeries",
                                                            QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
                     qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins",
                                                                    QLatin1String("Trying to create uncreatable: Margins."));
                 }
             };
             #include "plugin.moc"
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
-            Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
+            #ifndef QT5_QUICK_1
+                Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
+            #endif

plugins/plugins.pro +2 -2

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) {
                 warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.")
             } else {
                 SUBDIRS += declarative
             }
             !linux-arm*: {
-                SUBDIRS += \
+            #    SUBDIRS += \
-                        designer
+            #            designer
             }

src/src.pro +1 -1

             !include( ../config.pri ):error( "Couldn't find the config.pri file!" )
             ############################# BUILD CONFIG ######################################
             TARGET = $$LIBRARY_NAME
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT = core gui
             greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             win32:CONFIG += create_prl
             # treat warnings as errors
             win32-msvc*: {
                 QMAKE_CXXFLAGS += /WX
             } else {
-                QMAKE_CXXFLAGS += -Werror
+            #    QMAKE_CXXFLAGS += -Werror
             }
             unix:{
               QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
             }
             ############################# DEPEDENCES ########################################
             win32-msvc*: LIBS += User32.lib
             LIBS -= -l$$LIBRARY_NAME
             INCLUDEPATH += ../include .
             ############################# SOURCES ##########################################
             SOURCES += \
                 $$PWD/chartdataset.cpp \
                 $$PWD/chartpresenter.cpp \
                 $$PWD/charttheme.cpp \
                 $$PWD/domain.cpp \
                 $$PWD/qchart.cpp \
                 $$PWD/qchartview.cpp \
                 $$PWD/qabstractseries.cpp \
                 $$PWD/chartbackground.cpp \
                 $$PWD/chartelement.cpp \
                 $$PWD/scroller.cpp \
                 $$PWD/chartlayout.cpp \
                 $$PWD/charttitle.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartdataset_p.h \
                 $$PWD/chartitem_p.h \
                 $$PWD/chartpresenter_p.h \
                 $$PWD/charttheme_p.h \
                 $$PWD/domain_p.h \
                 $$PWD/chartbackground_p.h \
                 $$PWD/chartelement_p.h \
                 $$PWD/chartconfig_p.h \
                 $$PWD/qchart_p.h \
                 $$PWD/qchartview_p.h \
                 $$PWD/scroller_p.h \
                 $$PWD/qabstractseries_p.h \
                 $$PWD/chartlayout_p.h \
                 $$PWD/charttitle_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.h \
                 $$PWD/qabstractseries.h \
                 $$PWD/qchartview.h \
                 $$PWD/chartsnamespace.h
             include(animations/animations.pri)
             include(areachart/areachart.pri)
             include(axis/axis.pri)
             include(barchart/barchart.pri)
             include(legend/legend.pri)
             include(linechart/linechart.pri)
             include(piechart/piechart.pri)
             include(scatterchart/scatter.pri)
             include(splinechart/splinechart.pri)
             include(themes/themes.pri)
             include(xychart/xychart.pri)
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             ############################# BUILD PATH ##########################################
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             ############################# PUBLIC HEADERS GENERATOR ##########################################
             !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
             {
                 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
                  win32:{
                     command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal
                 system($$command)
             }
             for(file, PUBLIC_HEADERS) {
                 name = $$split(file,'/')
                 name = $$last(name)
                 class = "$$cat($$file)"
                 class = $$find(class,class)
                 !isEmpty(class){
                 class = $$split(class,QTCOMMERCIALCHART_EXPORT)
                 class = $$member(class,1)
                 class = $$split(class,' ')
                 class = $$replace(class,' ','')
                 class = $$member(class,0)
                 win32:{
                     command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
                 }
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
                 system($$command)
                 }
             }
             ############################# INSTALLERS ##########################################
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS
             INSTALLS += public_headers
             install_build_public_headers.name = build_public_headers
             install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_public_headers.input = PUBLIC_HEADERS
             install_build_public_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PUBLIC_HEADER_DIR
             install_build_public_headers.CONFIG += target_predeps \
                 no_link
             install_build_private_headers.name = build_private_headers
             install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_private_headers.input = PRIVATE_HEADERS
             install_build_private_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PRIVATE_HEADER_DIR
             install_build_private_headers.CONFIG += target_predeps \
                 no_link
             QMAKE_EXTRA_COMPILERS += install_build_public_headers \
                 install_build_private_headers \
             win32:{
                bintarget.CONFIG += no_check_exist
                !staticlib: {
                   bintarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.dll
                }
                win32-msvc*:CONFIG(debug, debug|release): {
                   bintarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.pdb
                }
                bintarget.path = $$[QT_INSTALL_BINS]
                libtarget.CONFIG += no_check_exist
                libtarget.files = $$CHART_BUILD_LIB_DIR\\$${TARGET}.prl
                win32-msvc*: {
                   libtarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.lib
                } else {
                   libtarget.files += $$CHART_BUILD_LIB_DIR\\lib$${TARGET}.a
                }
                libtarget.path = $$[QT_INSTALL_LIBS]
                DLLDESTDIR = $$CHART_BUILD_BIN_DIR
                INSTALLS += bintarget libtarget
             }else{
                target.path=$$[QT_INSTALL_LIBS]
                INSTALLS += target
             }
             mac: !staticlib: {
                 # Update the name (id) of the library on OSX to point to the lib path
                 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
                 QMAKE_POST_LINK += "install_name_tool -id $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME"
                 # Update the name (id) of the installed library on OSX to point to the installation path
                 postinstall.path = $$[QT_INSTALL_LIBS]
                 postinstall.extra = "install_name_tool -id $$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME $$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME"
                 INSTALLS += postinstall
             }
             ################################ DEVELOPMENT BUILD ##########################################
             # There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
             # This is the case at least with shadow builds.
             # http://qt-project.org/wiki/jom
             development_build:!win32-msvc*:{
                 chartversion.target = $$PWD/qchartversion_p.h
                 unix:{
                     chartversion.commands = @echo \
                         \" $${LITERAL_HASH}ifndef QCHARTVERSION_P_H\\n\
                         $${LITERAL_HASH}define QCHARTVERSION_P_H\\n\
                         const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" ; \\n\
                         const char *gitHead = \\\"`git rev-parse HEAD`\\\" ; \\n \
                         $${LITERAL_HASH}endif \"  \
                         > \
                         $$chartversion.target;
                 }else{
                     chartversion.commands = @echo \
                         "const char *buildTime = \"%date%_%time%\" ; \
                          const char *gitHead = \"unknown\" ; " \
                         > \
                         $$chartversion.target
                 }
                 chartversion.depends = $$HEADERS \
                     $$SOURCES
                 PRE_TARGETDEPS += $$chartversion.target
                 QMAKE_CLEAN += $$PWD/qchartversion_p.h
                 QMAKE_EXTRA_TARGETS += chartversion
             }
             ############################### CLEAN ###########################################
             unix:QMAKE_DISTCLEAN += -r \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             ############################## COVERAGE #########################################
             unix:coverage:{
             QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
             QMAKE_LDFLAGS += -fprofile-arcs -ftest-coverage
             LIBS += -lgcov
             QMAKE_CLEAN += $$OBJECTS_DIR/*.gcda $$OBJECTS_DIR/*.gcno $$PWD/*.gcov ../coverage/*.info
             QMAKE_EXTRA_TARGETS += preparecoverage gencoverage
             preparecoverage.target = prepare_coverage
             preparecoverage.depends = all
             preparecoverage.commands =  lcov --directory $$OBJECTS_DIR --zerocounters ;\
                                         lcov -i -d $$OBJECTS_DIR -c -o ../coverage/base.info -b $$PWD;
             gencoverage.target = gen_coverage
             gencoverage.depends = all
             gencoverage.commands = lcov -d $$OBJECTS_DIR -c -o ../coverage/src.info -b $$PWD;\
                                    lcov -e ../coverage/base.info $$PWD/* $$PWD/animations/* $$PWD/areachart/* $$PWD/axis/* $$PWD/barchart/* $$PWD/legend/* $$PWD/linechart/* $$PWD/piechart/* $$PWD/scatterchart/* $$PWD/splinechart/* $$PWD/themes/* $$PWD/xychart/* -o ../coverage/base.info;\
                                    lcov -e ../coverage/src.info $$PWD/* $$PWD/animations/* $$PWD/areachart/* $$PWD/axis/* $$PWD/barchart/* $$PWD/legend/* $$PWD/linechart/* $$PWD/piechart/* $$PWD/scatterchart/* $$PWD/splinechart/* $$PWD/themes/* $$PWD/xychart/* -o ../coverage/src.info;\
                                    lcov -a ../coverage/base.info -a ../coverage/src.info -o ../coverage/coverage.info;
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages