diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:10:44 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:13:58 +0200 |
| commit | b368e57e59351736f9ad06834a743a7c1b49d368 (patch) | |
| tree | 3b7d42569905d8cde0ca7571cd664428354a50dd /src/datavisualizationqml2/declarativetheme_p.h | |
| parent | eb3d0514ca886db33776522ea00f27b69bc86ad1 (diff) | |
| parent | 05d06fbc61f07e400b519a9b020c2473398627c1 (diff) | |
Merge branch 'develop'v1.0.0-beta1
Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4
Diffstat (limited to 'src/datavisualizationqml2/declarativetheme_p.h')
| -rw-r--r-- | src/datavisualizationqml2/declarativetheme_p.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h index 79c1f5c9..8101cf71 100644 --- a/src/datavisualizationqml2/declarativetheme_p.h +++ b/src/datavisualizationqml2/declarativetheme_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -32,13 +32,16 @@ #include "datavisualizationglobal_p.h" #include "declarativecolor_p.h" #include "colorgradient_p.h" -#include "q3dtheme.h" +#include "q3dtheme_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +#include <QtQml/qqmlparserstatus.h> -class DeclarativeTheme3D : public Q3DTheme +QT_BEGIN_NAMESPACE_DATAVISUALIZATION + +class DeclarativeTheme3D : public Q3DTheme, public QQmlParserStatus { Q_OBJECT + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren) Q_PROPERTY(QQmlListProperty<DeclarativeColor> baseColors READ baseColors) Q_PROPERTY(QQmlListProperty<ColorGradient> baseGradients READ baseGradients) @@ -73,11 +76,16 @@ public: void setMultiHighlightGradient(ColorGradient *gradient); ColorGradient *multiHighlightGradient() const; + // From QQmlParserStatus + virtual void classBegin(); + virtual void componentComplete(); + signals: void singleHighlightGradientChanged(ColorGradient *gradient); void multiHighlightGradientChanged(ColorGradient *gradient); protected: + void handleTypeChange(Theme themeType); void handleBaseColorUpdate(); void handleBaseGradientUpdate(); void handleSingleHLGradientUpdate(); @@ -113,6 +121,6 @@ private: bool m_dummyColors; }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION #endif |