HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2742:b1d7efa360aa

Remove deprecated elements from APIs....

Miikka Heikkinen -

r2742:b1d7efa360aa

parent child

Context file:

r2742:b1d7efa360aa

Expand all files

examples/charts/qmlcustomlegend/qml/qmlcustomlegend/ChartViewHighlighted.qml +1 -1

                         titleText: "EUR"
                         min: 0
                         max: 40000
-                        niceNumbersEnabled: true
                         labelFormat: "%.0f"
                         tickCount: 5
                     }
                     }
                     chartViewHighlighted.title = selectedSeries.name;
                     axisY.max = maxVal;
+                    axisY.applyNiceNumbers()
                 }
             }

src/charts/axis/chartaxiselement.cpp 0 -12

                 QObject::connect(axis(), SIGNAL(shadesVisibleChanged(bool)), this, SLOT(handleShadesVisibleChanged(bool)));
                 QObject::connect(axis(), SIGNAL(labelsAngleChanged(int)), this, SLOT(handleLabelsAngleChanged(int)));
                 QObject::connect(axis(), SIGNAL(linePenChanged(const QPen&)), this, SLOT(handleArrowPenChanged(const QPen&)));
-                QObject::connect(axis(), SIGNAL(labelsPenChanged(const QPen&)), this, SLOT(handleLabelsPenChanged(const QPen&)));
                 QObject::connect(axis(), SIGNAL(labelsBrushChanged(const QBrush&)), this, SLOT(handleLabelsBrushChanged(const QBrush&)));
                 QObject::connect(axis(), SIGNAL(labelsFontChanged(const QFont&)), this, SLOT(handleLabelsFontChanged(const QFont&)));
                 QObject::connect(axis(), SIGNAL(gridLinePenChanged(const QPen&)), this, SLOT(handleGridPenChanged(const QPen&)));
                 QObject::connect(axis(), SIGNAL(shadesBrushChanged(const QBrush&)), this, SLOT(handleShadesBrushChanged(const QBrush&)));
                 QObject::connect(axis(), SIGNAL(titleTextChanged(const QString&)), this, SLOT(handleTitleTextChanged(const QString&)));
                 QObject::connect(axis(), SIGNAL(titleFontChanged(const QFont&)), this, SLOT(handleTitleFontChanged(const QFont&)));
-                QObject::connect(axis(), SIGNAL(titlePenChanged(const QPen&)), this, SLOT(handleTitlePenChanged(const QPen&)));
                 QObject::connect(axis(), SIGNAL(titleBrushChanged(const QBrush&)), this, SLOT(handleTitleBrushChanged(const QBrush&)));
                 QObject::connect(axis(), SIGNAL(titleVisibleChanged(bool)), this, SLOT(handleTitleVisibleChanged(bool)));
                 QObject::connect(axis()->d_ptr.data(), SIGNAL(rangeChanged(qreal, qreal)), this, SLOT(handleRangeChanged(qreal, qreal)));
                 presenter()->layout()->invalidate();
             }
-            void ChartAxisElement::handleLabelsPenChanged(const QPen &pen)
-                Q_UNUSED(pen)
             void ChartAxisElement::handleLabelsBrushChanged(const QBrush &brush)
             {
                 foreach (QGraphicsItem *item, m_labels->childItems())
                     m_title->setHtml(title);
             }
-            void ChartAxisElement::handleTitlePenChanged(const QPen &pen)
-                Q_UNUSED(pen)
             void ChartAxisElement::handleTitleBrushChanged(const QBrush &brush)
             {
                 m_title->setDefaultTextColor(brush.color());

src/charts/axis/chartaxiselement_p.h 0 -2

                 virtual void handleShadesPenChanged(const QPen &pen) = 0;
                 virtual void handleArrowPenChanged(const QPen &pen) = 0;
                 virtual void handleGridPenChanged(const QPen &pen) = 0;
-                void handleLabelsPenChanged(const QPen &pen);
                 void handleLabelsBrushChanged(const QBrush &brush);
                 void handleLabelsFontChanged(const QFont &font);
-                void handleTitlePenChanged(const QPen &pen);
                 void handleTitleBrushChanged(const QBrush &brush);
                 void handleTitleFontChanged(const QFont &font);
                 void handleTitleTextChanged(const QString &title);

src/charts/axis/qabstractaxis.cpp +1 -63

             */
             /*!
-              \property QAbstractAxis::labelsPen
-              \deprecated
-              The pen of the labels.
-            */
-            /*!
               \property QAbstractAxis::labelsBrush
               The brush of the labels. Only the color of the brush is relevant.
             */
             */
             /*!
-              \property QAbstractAxis::titlePen
-              \deprecated
-              The pen of the title text.
-            */
-            /*!
               \property QAbstractAxis::titleBrush
               The brush of the title text. Only the color of the brush is relevant.
             */
             */
             /*!
-              \fn void QAbstractAxis::labelsPenChanged(const QPen& pen)
-              \deprecated
-              The pen of the axis labels has changed to \a pen.
-            */
-            /*!
               \fn void QAbstractAxis::labelsBrushChanged(const QBrush& brush)
               The brush of the axis labels has changed to \a brush.
             */
             */
             /*!
-              \fn void QAbstractAxis::titlePenChanged(const QPen& pen)
-              \deprecated
-              The pen of the axis shades has changed to \a pen.
-            */
-            /*!
               \fn void QAbstractAxis::titleBrushChanged(const QBrush& brush)
               The brush of the axis title has changed to \a brush.
             */
                 return d_ptr->m_labelsVisible;
             }
-            void QAbstractAxis::setLabelsPen(const QPen &pen)
-                if (d_ptr->m_labelsPen != pen) {
-                    d_ptr->m_labelsPen = pen;
-                    emit labelsPenChanged(pen);
-            QPen QAbstractAxis::labelsPen() const
-                if (d_ptr->m_labelsPen == QChartPrivate::defaultPen())
-                    return QPen();
-                else
-                    return d_ptr->m_labelsPen;
             /*!
               Sets \a brush used to draw labels.
              */
                 return d_ptr->m_titleVisible;
             }
-            void QAbstractAxis::setTitlePen(const QPen &pen)
-                if (d_ptr->m_titlePen != pen) {
-                    d_ptr->m_titlePen = pen;
-                    emit titlePenChanged(pen);
-            QPen QAbstractAxis::titlePen() const
-                if (d_ptr->m_titlePen == QChartPrivate::defaultPen())
-                    return QPen();
-                else
-                    return d_ptr->m_titlePen;
             /*!
               Sets \a brush used to draw title.
              */
             /*!
               Returns the orientation in which the axis is being used (Vertical or Horizontal)
             */
-            Qt::Orientation QAbstractAxis::orientation()
+            Qt::Orientation QAbstractAxis::orientation() const
             {
                 return d_ptr->orientation();
             }
                   m_gridLineVisible(true),
                   m_gridLinePen(QChartPrivate::defaultPen()),
                   m_labelsVisible(true),
-                  m_labelsPen(QChartPrivate::defaultPen()),
                   m_labelsBrush(QChartPrivate::defaultBrush()),
                   m_labelsFont(QChartPrivate::defaultFont()),
                   m_labelsAngle(0),
                   m_titleVisible(true),
-                  m_titlePen(QChartPrivate::defaultPen()),
                   m_titleBrush(QChartPrivate::defaultBrush()),
                   m_titleFont(QChartPrivate::defaultFont()),
                   m_shadesVisible(false),
                 if (forced || QChartPrivate::defaultBrush() == m_labelsBrush)
                     q_ptr->setLabelsBrush(theme->labelBrush());
-                if (forced || QChartPrivate::defaultPen() == m_labelsPen)
-                    q_ptr->setLabelsPen(Qt::NoPen); // NoPen for performance reasons
                 if (forced || QChartPrivate::defaultFont() == m_labelsFont)
                     q_ptr->setLabelsFont(theme->labelFont());
                 if (forced || QChartPrivate::defaultBrush() == m_titleBrush)
                     q_ptr->setTitleBrush(theme->labelBrush());
-                if (forced || QChartPrivate::defaultPen() == m_titlePen)
-                    q_ptr->setTitlePen(Qt::NoPen); // NoPen for performance reasons
                 if (forced || QChartPrivate::defaultFont() == m_titleFont) {
                     QFont font(m_labelsFont);
                     font.setBold(true);

src/charts/axis/qabstractaxis.h +1 -9

                 Q_PROPERTY(QColor color READ linePenColor WRITE setLinePenColor NOTIFY colorChanged)
                 //labels
                 Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
-                Q_PROPERTY(QPen labelsPen READ labelsPen WRITE setLabelsPen NOTIFY labelsPenChanged)
                 Q_PROPERTY(QBrush labelsBrush READ labelsBrush WRITE setLabelsBrush NOTIFY labelsBrushChanged)
                 Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle NOTIFY labelsAngleChanged)
                 Q_PROPERTY(QFont labelsFont READ labelsFont WRITE setLabelsFont NOTIFY labelsFontChanged)
                 Q_PROPERTY(QBrush shadesBrush READ shadesBrush WRITE setShadesBrush NOTIFY shadesBrushChanged)
                 //title
                 Q_PROPERTY(QString titleText READ titleText WRITE setTitleText NOTIFY titleTextChanged)
-                Q_PROPERTY(QPen titlePen READ titlePen WRITE setTitlePen NOTIFY titlePenChanged)
                 Q_PROPERTY(QBrush titleBrush READ titleBrush WRITE setTitleBrush NOTIFY titleBrushChanged)
                 Q_PROPERTY(bool titleVisible READ isTitleVisible WRITE setTitleVisible NOTIFY titleVisibleChanged)
                 Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont NOTIFY titleFontChanged)
                 //labels handling
                 bool labelsVisible() const;
                 void setLabelsVisible(bool visible = true);
-                void setLabelsPen(const QPen &pen);
-                QPen labelsPen() const;
                 void setLabelsBrush(const QBrush &brush);
                 QBrush labelsBrush() const;
                 void setLabelsFont(const QFont &font);
                 //title handling
                 bool isTitleVisible() const;
                 void setTitleVisible(bool visible = true);
-                void setTitlePen(const QPen &pen);
-                QPen titlePen() const;
                 void setTitleBrush(const QBrush &brush);
                 QBrush titleBrush() const;
                 void setTitleFont(const QFont &font);
                 void setShadesBorderColor(QColor color);
                 QColor shadesBorderColor() const;
-                Qt::Orientation orientation();
+                Qt::Orientation orientation() const;
                 Qt::Alignment alignment() const;
                 //range handling
                 void linePenChanged(const QPen &pen);
                 void lineVisibleChanged(bool visible);
                 void labelsVisibleChanged(bool visible);
-                void labelsPenChanged(const QPen &pen);
                 void labelsBrushChanged(const QBrush &brush);
                 void labelsFontChanged(const QFont &pen);
                 void labelsAngleChanged(int angle);
                 void colorChanged(QColor color);
                 void labelsColorChanged(QColor color);
                 void titleTextChanged(const QString &title);
-                void titlePenChanged(const QPen &pen);
                 void titleBrushChanged(const QBrush &brush);
                 void titleVisibleChanged(bool visible);
                 void titleFontChanged(const QFont &font);

src/charts/axis/qabstractaxis_p.h 0 -2

                 QPen m_gridLinePen;
                 bool m_labelsVisible;
-                QPen m_labelsPen;
                 QBrush m_labelsBrush;
                 QFont m_labelsFont;
                 int m_labelsAngle;
                 bool m_titleVisible;
-                QPen m_titlePen;
                 QBrush m_titleBrush;
                 QFont m_titleFont;
                 QString m_title;

src/charts/axis/valueaxis/qvalueaxis.cpp +1 -38

@@ -172,17 +172,6 QT_CHARTS_BEGIN_NAMESPACE
172	*/	172	*/
173		173
174	/*!	174	/*!
175	\property QValueAxis::niceNumbersEnabled
176	\obsolete
177	Using this function can lead to unexpected behavior. Use applyNiceNumbers() instead.
178	*/
179
180	/*!
181	\qmlproperty bool ValueAxis::niceNumbersEnabled
182	Deprecated; Using this function can lead to unexpected behavior. Use applyNiceNumbers() instead.
183	*/
184
185	/*!
186	Constructs an axis object which is a child of \a parent.	175	Constructs an axis object which is a child of \a parent.
187	*/	176	*/
188	QValueAxis::QValueAxis(QObject *parent) :	177	QValueAxis::QValueAxis(QObject *parent) :
@@ -259,31 +248,6 int QValueAxis::tickCount() const
259	return d->m_tickCount;	248	return d->m_tickCount;
260	}	249	}
261		250
262	void QValueAxis::setNiceNumbersEnabled(bool enable)
263	{
264	Q_D(QValueAxis);
265	qWarning() << "Deprecated; Using this function can lead to unexpected behavior. " \
266	"Use applyNiceNumbers() instead.";
267	if(enable) {
268	QObject::connect(this,SIGNAL(rangeChanged(qreal,qreal)),this,SLOT(applyNiceNumbers()));
269	QObject::connect(this,SIGNAL(tickCountChanged(int)),this,SLOT(applyNiceNumbers()));
270	applyNiceNumbers();
271	}
272	else {
273	QObject::disconnect(this,SIGNAL(rangeChanged(qreal,qreal)),this,SLOT(applyNiceNumbers()));
274	QObject::disconnect(this,SIGNAL(tickCountChanged(int)),this,SLOT(applyNiceNumbers()));
275	}
276	d->m_niceNumbersEnabled=enable;
277	}
278
279	bool QValueAxis::niceNumbersEnabled() const
280	{
281	Q_D(const QValueAxis);
282	qWarning() << "Deprecated; Using this function can lead to unexpected behavior. " \
283	"Use applyNiceNumbers() instead.";
284	return d->m_niceNumbersEnabled;
285	}
286
287	void QValueAxis::setLabelFormat(const QString &format)	251	void QValueAxis::setLabelFormat(const QString &format)
288	{	252	{
289	Q_D(QValueAxis);	253	Q_D(QValueAxis);
@@ -333,8 +297,7 QValueAxisPrivate::QValueAxisPrivate(QValueAxis *q)
333	m_max(0),	297	m_max(0),
334	m_tickCount(5),	298	m_tickCount(5),
335	m_format(QString::null),	299	m_format(QString::null),
336	m_applying(false),	300	m_applying(false)
337	m_niceNumbersEnabled(false)
338	{	301	{
339		302
340	}	303	}

src/charts/axis/valueaxis/qvalueaxis.h 0 -4

             {
                 Q_OBJECT
                 Q_PROPERTY(int tickCount READ tickCount WRITE setTickCount NOTIFY tickCountChanged)
-                Q_PROPERTY(bool niceNumbersEnabled READ niceNumbersEnabled WRITE setNiceNumbersEnabled)
                 Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY minChanged)
                 Q_PROPERTY(qreal max READ max WRITE setMax NOTIFY maxChanged)
                 Q_PROPERTY(QString labelFormat READ labelFormat WRITE setLabelFormat NOTIFY labelFormatChanged)
                 void setLabelFormat(const QString &format);
                 QString labelFormat() const;
-                void setNiceNumbersEnabled(bool enable = true);
-                bool niceNumbersEnabled() const;
             public Q_SLOTS:
                 void applyNiceNumbers();

src/charts/axis/valueaxis/qvalueaxis_p.h +2 -3

                 void initializeGraphics(QGraphicsItem* parent);
                 void initializeDomain(AbstractDomain *domain);
-                qreal min() { return m_min; };
+                qreal min() { return m_min; }
-                qreal max() { return m_max; };
+                qreal max() { return m_max; }
                 void setRange(qreal min,qreal max);
             protected:
                 int m_tickCount;
                 QString m_format;
                 bool m_applying;
-                bool m_niceNumbersEnabled;
                 Q_DECLARE_PUBLIC(QValueAxis)
             };

src/charts/qchart.cpp 0 -20

@@ -102,14 +102,6 QT_CHARTS_BEGIN_NAMESPACE
102	*/	102	*/
103		103
104	/*!	104	/*!
105	\property QChart::minimumMargins
106	Minimum margins between the plot area (axes) and the edge of the chart widget.
107	This property is deprecated; use margins property instead.
108
109	\sa margins
110	*/
111
112	/*!
113	\property QChart::margins	105	\property QChart::margins
114	Margins between the plot area (axes) and the edge of the chart widget.	106	Margins between the plot area (axes) and the edge of the chart widget.
115	*/	107	*/
@@ -503,18 +495,6 QLegend *QChart::legend() const
503	return d_ptr->m_legend;	495	return d_ptr->m_legend;
504	}	496	}
505		497
506	void QChart::setMinimumMargins(const QMargins &margins)
507	{
508	qWarning() << "QChart::setMinimumMargins is deprecated. Use QChart::setMargins instead.";
509	d_ptr->m_presenter->layout()->setMargins(margins);
510	}
511
512	QMargins QChart::minimumMargins() const
513	{
514	qWarning() << "QChart::minimumMargins is deprecated. Use QChart::margins instead.";
515	return d_ptr->m_presenter->layout()->margins();
516	}
517
518	void QChart::setMargins(const QMargins &margins)	498	void QChart::setMargins(const QMargins &margins)
519	{	499	{
520	d_ptr->m_presenter->layout()->setMargins(margins);	500	d_ptr->m_presenter->layout()->setMargins(margins);

src/charts/qchart.h 0 -4

                 Q_PROPERTY(bool dropShadowEnabled READ isDropShadowEnabled WRITE setDropShadowEnabled)
                 Q_PROPERTY(qreal backgroundRoundness READ backgroundRoundness WRITE setBackgroundRoundness)
                 Q_PROPERTY(QChart::AnimationOptions animationOptions READ animationOptions WRITE setAnimationOptions)
-                Q_PROPERTY(QMargins minimumMargins READ minimumMargins WRITE setMinimumMargins)
                 Q_PROPERTY(QMargins margins READ margins WRITE setMargins)
                 Q_PROPERTY(QChart::ChartType chartType READ chartType)
                 Q_PROPERTY(bool plotAreaBackgroundVisible READ isPlotAreaBackgroundVisible WRITE setPlotAreaBackgroundVisible)
                 QLegend *legend() const;
-                void setMinimumMargins(const QMargins& margins);
-                QMargins minimumMargins() const;
                 void setMargins(const QMargins &margins);
                 QMargins margins() const;

src/charts/qchartview.cpp +5 -5

                 \value NoRubberBand
                 \value VerticalRubberBand
-                \value HorizonalRubberBand
+                \value HorizontalRubberBand
                 \value RectangleRubberBand
             */
                         d_ptr->m_rubberBandOrigin.setY(rect.top());
                         height = rect.height();
                     }
-                    if (!d_ptr->m_rubberBandFlags.testFlag(HorizonalRubberBand)) {
+                    if (!d_ptr->m_rubberBandFlags.testFlag(HorizontalRubberBand)) {
                         d_ptr->m_rubberBandOrigin.setX(rect.left());
                         width = rect.width();
                     }
                         if (d_ptr->m_rubberBandFlags == VerticalRubberBand) {
                             rect.setX(d_ptr->m_chart->plotArea().x());
                             rect.setWidth(d_ptr->m_chart->plotArea().width());
-                        } else if (d_ptr->m_rubberBandFlags == HorizonalRubberBand) {
+                        } else if (d_ptr->m_rubberBandFlags == HorizontalRubberBand) {
                             rect.setY(d_ptr->m_chart->plotArea().y());
                             rect.setHeight(d_ptr->m_chart->plotArea().height());
                         }
                         // Since there is no suitable API for that, use zoomIn with rect bigger than the
                         // plot area.
                         if (d_ptr->m_rubberBandFlags == VerticalRubberBand
-                            || d_ptr->m_rubberBandFlags == HorizonalRubberBand) {
+                            || d_ptr->m_rubberBandFlags == HorizontalRubberBand) {
                             QRectF rect = d_ptr->m_chart->plotArea();
                             if (d_ptr->m_rubberBandFlags == VerticalRubberBand) {
                                 qreal adjustment = rect.height() / 2;
                                 rect.adjust(0, -adjustment, 0, adjustment);
-                            } else if (d_ptr->m_rubberBandFlags == HorizonalRubberBand) {
+                            } else if (d_ptr->m_rubberBandFlags == HorizontalRubberBand) {
                                 qreal adjustment = rect.width() / 2;
                                 rect.adjust(-adjustment, 0, adjustment, 0);
                             }

src/charts/qchartview.h +1 -1

                 enum  RubberBand {
                     NoRubberBand = 0x0,
                     VerticalRubberBand = 0x1,
-                    HorizonalRubberBand = 0x2,
+                    HorizontalRubberBand = 0x2,
                     RectangleRubberBand = 0x3
                 };

src/chartsqml2/declarativechart.cpp +11 -66

@@ -132,40 +132,10 QT_CHARTS_BEGIN_NAMESPACE
132	*/	132	*/
133		133
134	/*!	134	/*!
135	\qmlproperty real ChartView::topMargin
136	Deprecated; use margins instead.
137	*/
138
139	/*!
140	\qmlproperty real ChartView::bottomMargin
141	Deprecated; use margins instead.
142	*/
143
144	/*!
145	\qmlproperty real ChartView::leftMargin
146	Deprecated; use margins instead.
147	*/
148
149	/*!
150	\qmlproperty real ChartView::rightMargin
151	Deprecated; use margins instead.
152	*/
153
154	/*!
155	\qmlproperty Margins ChartView::minimumMargins
156	Deprecated; use margins instead.
157	The minimum margins allowed between the outer bounds and the plotArea of the ChartView. Margins
158	area of ChartView is used for drawing title, axes and legend. Please note that setting the
159	properties of minimumMargins may be bigger than the defined value, depending on other ChartView
160	properties that affect it's layout. If you need to know the actual plotting area used at any
161	given time, you can check ChartView::plotArea instead.
162	*/
163
164	/*!
165	\qmlproperty rect ChartView::plotArea	135	\qmlproperty rect ChartView::plotArea
166	The area on the ChartView that is used for drawing series. This is the ChartView rect without the	136	The area on the ChartView that is used for drawing series. This is the ChartView rect without the
167	margins.	137	margins.
168	\sa ChartView::m~~inimumM~~argins	138	\sa ChartView::margins
169	*/	139	*/
170		140
171	/*!	141	/*!
@@ -314,10 +284,14 void DeclarativeChart::initChart(QChart::ChartType type)
314	m_margins->setLeft(m_chart->margins().left());	284	m_margins->setLeft(m_chart->margins().left());
315	m_margins->setRight(m_chart->margins().right());	285	m_margins->setRight(m_chart->margins().right());
316	m_margins->setBottom(m_chart->margins().bottom());	286	m_margins->setBottom(m_chart->margins().bottom());
317	connect(m_margins, SIGNAL(topChanged(int,int,int,int)), ~~this~~, ~~SLOT~~(~~changeMinimumMargins~~(~~int~~,~~int~~,~~int~~,~~int)));~~	287	connect(m_margins, SIGNAL(topChanged(int,int,int,int)),
318	connect(m_margins, SIGNAL(bottomChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));	288	this, SLOT(changeMargins(int,int,int,int)));
319	connect(m_margins, SIGNAL(~~left~~Changed(int,int,int,int)), ~~this~~, ~~SLOT~~(~~changeMinimumMargins~~(~~int~~,~~int~~,~~int~~,~~int)));~~	289	connect(m_margins, SIGNAL(bottomChanged(int,int,int,int)),
320	connect(m_margins, SIGNAL(rightChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));	290	this, SLOT(changeMargins(int,int,int,int)));
		291	connect(m_margins, SIGNAL(leftChanged(int,int,int,int)),
		292	this, SLOT(changeMargins(int,int,int,int)));
		293	connect(m_margins, SIGNAL(rightChanged(int,int,int,int)),
		294	this, SLOT(changeMargins(int,int,int,int)));
321	connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries)), this, SLOT(handleSeriesAdded(QAbstractSeries)));	295	connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries)), this, SLOT(handleSeriesAdded(QAbstractSeries)));
322	connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries)), this, SIGNAL(seriesRemoved(QAbstractSeries)));	296	connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries)), this, SIGNAL(seriesRemoved(QAbstractSeries)));
323	connect(m_chart, &QChart::plotAreaChanged, this, &DeclarativeChart::plotAreaChanged);	297	connect(m_chart, &QChart::plotAreaChanged, this, &DeclarativeChart::plotAreaChanged);
@@ -328,10 +302,10 void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series)
328	emit seriesAdded(series);	302	emit seriesAdded(series);
329	}	303	}
330		304
331	void DeclarativeChart::changeM~~inimumM~~argins(int top, int bottom, int left, int right)	305	void DeclarativeChart::changeMargins(int top, int bottom, int left, int right)
332	{	306	{
333	m_chart->setMargins(QMargins(left, top, right, bottom));	307	m_chart->setMargins(QMargins(left, top, right, bottom));
334	emit m~~inimumM~~arginsChanged();	308	emit marginsChanged();
335	}	309	}
336		310
337	DeclarativeChart::~DeclarativeChart()	311	DeclarativeChart::~DeclarativeChart()
@@ -793,30 +767,6 void DeclarativeChart::setBackgroundRoundness(qreal diameter)
793	}	767	}
794	}	768	}
795		769
796	qreal DeclarativeChart::topMargin()
797	{
798	qWarning() << "ChartView.topMargin is deprecated. Use margins instead.";
799	return m_chart->margins().top();
800	}
801
802	qreal DeclarativeChart::bottomMargin()
803	{
804	qWarning() << "ChartView.bottomMargin is deprecated. Use margins instead.";
805	return m_chart->margins().bottom();
806	}
807
808	qreal DeclarativeChart::leftMargin()
809	{
810	qWarning() << "ChartView.leftMargin is deprecated. Use margins instead.";
811	return m_chart->margins().left();
812	}
813
814	qreal DeclarativeChart::rightMargin()
815	{
816	qWarning() << "ChartView.rightMargin is deprecated. Use margins instead.";
817	return m_chart->margins().right();
818	}
819
820	void DeclarativeChart::zoom(qreal factor)	770	void DeclarativeChart::zoom(qreal factor)
821	{	771	{
822	m_chart->zoom(factor);	772	m_chart->zoom(factor);
@@ -995,11 +945,6 void DeclarativeChart::setAxisY(QAbstractAxis axis, QAbstractSeries series)
995	seriesAxisAttachHelper(series, axis, Qt::Vertical, Qt::AlignLeft);	945	seriesAxisAttachHelper(series, axis, Qt::Vertical, Qt::AlignLeft);
996	}	946	}
997		947
998	void DeclarativeChart::createDefaultAxes()
999	{
1000	qWarning() << "ChartView.createDefaultAxes() is deprecated. Axes are created automatically.";
1001	}
1002
1003	QAbstractAxis DeclarativeChart::defaultAxis(Qt::Orientation orientation, QAbstractSeries series)	948	QAbstractAxis DeclarativeChart::defaultAxis(Qt::Orientation orientation, QAbstractSeries series)
1004	{	949	{
1005	if (!series) {	950	if (!series) {

src/chartsqml2/declarativechart.h +1 -13

                 Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
                 Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged)
                 Q_PROPERTY(qreal backgroundRoundness READ backgroundRoundness WRITE setBackgroundRoundness NOTIFY backgroundRoundnessChanged REVISION 3)
-                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(DeclarativeMargins *margins READ margins NOTIFY marginsChanged REVISION 2)
                 Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged REVISION 1)
                 Q_PROPERTY(QColor plotAreaColor READ plotAreaColor WRITE setPlotAreaColor NOTIFY plotAreaColorChanged REVISION 3)
                 void setBackgroundRoundness(qreal diameter);
                 // Margins & plotArea
-                qreal topMargin();
-                qreal bottomMargin();
-                qreal leftMargin();
-                qreal rightMargin();
-                DeclarativeMargins *minimumMargins() { return m_margins; }
                 DeclarativeMargins *margins() { return m_margins; }
                 QRectF plotArea() { return m_chart->plotArea(); }
                 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);
                 void titleColorChanged(QColor color);
                 void backgroundColorChanged();
                 void dropShadowEnabledChanged(bool enabled);
-                void minimumMarginsChanged();
                 Q_REVISION(2) void marginsChanged();
                 void plotAreaChanged(QRectF plotArea);
                 void seriesAdded(QAbstractSeries *series);
                 Q_REVISION(4) void localeChanged();
             private Q_SLOTS:
-                void changeMinimumMargins(int top, int bottom, int left, int right);
+                void changeMargins(int top, int bottom, int left, int right);
                 void handleAxisXSet(QAbstractAxis *axis);
                 void handleAxisYSet(QAbstractAxis *axis);
                 void handleAxisXTopSet(QAbstractAxis *axis);

src/chartsqml2/plugins.qmltypes 0 -23

                     Property { name: "backgroundColor"; type: "QColor" }
                     Property { name: "dropShadowEnabled"; type: "bool" }
                     Property { name: "backgroundRoundness"; revision: 3; type: "double" }
-                    Property { name: "topMargin"; type: "double"; isReadonly: true }
-                    Property { name: "bottomMargin"; type: "double"; isReadonly: true }
-                    Property { name: "leftMargin"; type: "double"; isReadonly: true }
-                    Property { name: "rightMargin"; type: "double"; isReadonly: true }
-                    Property {
-                        name: "minimumMargins"
-                        revision: 1
-                        type: "DeclarativeMargins"
-                        isReadonly: true
-                        isPointer: true
                     Property {
                         name: "margins"
                         revision: 2
                         name: "setAxisY"
                         Parameter { name: "axis"; type: "QAbstractAxis"; isPointer: true }
                     }
-                    Method { name: "createDefaultAxes" }
                     Method {
                         name: "axisX"
                         type: "QAbstractAxis*"
                     Property { name: "linePen"; type: "QPen" }
                     Property { name: "color"; type: "QColor" }
                     Property { name: "labelsVisible"; type: "bool" }
-                    Property { name: "labelsPen"; type: "QPen" }
                     Property { name: "labelsBrush"; type: "QBrush" }
                     Property { name: "labelsAngle"; type: "int" }
                     Property { name: "labelsFont"; type: "QFont" }
                     Property { name: "shadesPen"; type: "QPen" }
                     Property { name: "shadesBrush"; type: "QBrush" }
                     Property { name: "titleText"; type: "string" }
-                    Property { name: "titlePen"; type: "QPen" }
                     Property { name: "titleBrush"; type: "QBrush" }
                     Property { name: "titleVisible"; type: "bool" }
                     Property { name: "titleFont"; type: "QFont" }
                         Parameter { name: "visible"; type: "bool" }
                     }
                     Signal {
-                        name: "labelsPenChanged"
-                        Parameter { name: "pen"; type: "QPen" }
-                    Signal {
                         name: "labelsBrushChanged"
                         Parameter { name: "brush"; type: "QBrush" }
                     }
                         Parameter { name: "title"; type: "string" }
                     }
                     Signal {
-                        name: "titlePenChanged"
-                        Parameter { name: "pen"; type: "QPen" }
-                    Signal {
                         name: "titleBrushChanged"
                         Parameter { name: "brush"; type: "QBrush" }
                     }
                     ]
                     exportMetaObjectRevisions: [0, 0, 0]
                     Property { name: "tickCount"; type: "int" }
-                    Property { name: "niceNumbersEnabled"; type: "bool" }
                     Property { name: "min"; type: "double" }
                     Property { name: "max"; type: "double" }
                     Property { name: "labelFormat"; type: "string" }

tests/auto/qabstractaxis/tst_qabstractaxis.cpp 0 -44

@@ -56,7 +56,6 void tst_QAbstractAxis::qabstractaxis()
56	QCOMPARE(m_axis->labelsAngle(), 0);	56	QCOMPARE(m_axis->labelsAngle(), 0);
57	QCOMPARE(m_axis->labelsBrush(), QBrush());	57	QCOMPARE(m_axis->labelsBrush(), QBrush());
58	QCOMPARE(m_axis->labelsFont(), QFont());	58	QCOMPARE(m_axis->labelsFont(), QFont());
59	QCOMPARE(m_axis->labelsPen(), QPen());
60	QCOMPARE(m_axis->labelsVisible(), true);	59	QCOMPARE(m_axis->labelsVisible(), true);
61	QCOMPARE(m_axis->orientation(), Qt::Orientation(0));	60	QCOMPARE(m_axis->orientation(), Qt::Orientation(0));
62	m_axis->setLineVisible(false);	61	m_axis->setLineVisible(false);
@@ -68,7 +67,6 void tst_QAbstractAxis::qabstractaxis()
68	m_axis->setLabelsBrush(QBrush());	67	m_axis->setLabelsBrush(QBrush());
69	m_axis->setLabelsColor(QColor());	68	m_axis->setLabelsColor(QColor());
70	m_axis->setLabelsFont(QFont());	69	m_axis->setLabelsFont(QFont());
71	m_axis->setLabelsPen(QPen());
72	m_axis->setLabelsVisible(false);	70	m_axis->setLabelsVisible(false);
73	m_axis->setMax(QVariant());	71	m_axis->setMax(QVariant());
74	m_axis->setMin(QVariant());	72	m_axis->setMin(QVariant());
@@ -443,48 +441,6 void tst_QAbstractAxis::labelsFont()
443		441
444	}	442	}
445		443
446	void tst_QAbstractAxis::labelsPen_data()
447	{
448	QTest::addColumn<QPen>("labelsPen");
449	QTest::newRow("null") << QPen();
450	QTest::newRow("blue") << QPen(Qt::blue);
451	QTest::newRow("black") << QPen(Qt::black);
452	QTest::newRow("red") << QPen(Qt::red);
453	}
454
455	void tst_QAbstractAxis::labelsPen()
456	{
457	QFETCH(QPen, labelsPen);
458
459	QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
460	QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
461	QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
462	QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
463	QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
464	QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
465	QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
466	QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
467	QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
468
469	m_axis->setLabelsPen(labelsPen);
470	QCOMPARE(m_axis->labelsPen(), labelsPen);
471
472	QCOMPARE(spy0.count(), 0);
473	QCOMPARE(spy1.count(), 0);
474	QCOMPARE(spy2.count(), 0);
475	QCOMPARE(spy3.count(), 0);
476	QCOMPARE(spy4.count(), 0);
477	QCOMPARE(spy5.count(), 0);
478	QCOMPARE(spy6.count(), 0);
479	QCOMPARE(spy7.count(), 0);
480	QCOMPARE(spy8.count(), 0);
481
482	m_chart->setAxisX(m_axis, m_series);
483	m_view->show();
484	QTest::qWaitForWindowShown(m_view);
485	//TODO QCOMPARE(m_axis->labelsPen(), labelsPen);
486	}
487
488	void tst_QAbstractAxis::labelsVisible_data()	444	void tst_QAbstractAxis::labelsVisible_data()
489	{	445	{
490	QTest::addColumn<bool>("labelsVisible");	446	QTest::addColumn<bool>("labelsVisible");

tests/auto/qabstractaxis/tst_qabstractaxis.h 0 -2

                 void labelsColor();
                 void labelsFont_data();
                 void labelsFont();
-                void labelsPen_data();
-                void labelsPen();
                 void labelsVisible_data();
                 void labelsVisible();
                 void orientation_data();

tests/auto/qchartview/tst_qchartview.cpp +2 -2

                 QTest::addColumn<QPoint>("max");
                 if (isPolarTest()) {
-                    QTest::newRow("HorizonalRubberBand") << QChartView::RubberBands(QChartView::HorizonalRubberBand) << 0 << 0 << QPoint(5,5) << QPoint(5,5);
+                    QTest::newRow("HorizontalRubberBand") << QChartView::RubberBands(QChartView::HorizontalRubberBand) << 0 << 0 << QPoint(5,5) << QPoint(5,5);
                     QTest::newRow("VerticalRubberBand") <<  QChartView::RubberBands(QChartView::VerticalRubberBand) << 0 << 0 << QPoint(5,5) << QPoint(5,5);
                     QTest::newRow("RectangleRubberBand") <<  QChartView::RubberBands(QChartView::RectangleRubberBand) << 0 << 0 << QPoint(5,5) << QPoint(5,5);
                 } else {
-                    QTest::newRow("HorizonalRubberBand") << QChartView::RubberBands(QChartView::HorizonalRubberBand) << 0 << 1 << QPoint(5,5) << QPoint(5,5);
+                    QTest::newRow("HorizontalRubberBand") << QChartView::RubberBands(QChartView::HorizontalRubberBand) << 0 << 1 << QPoint(5,5) << QPoint(5,5);
                     QTest::newRow("VerticalRubberBand") <<  QChartView::RubberBands(QChartView::VerticalRubberBand) << 1 << 0 << QPoint(5,5) << QPoint(5,5);
                     QTest::newRow("RectangleRubberBand") <<  QChartView::RubberBands(QChartView::RectangleRubberBand) << 1 << 1 << QPoint(5,5) << QPoint(5,5);
                 }

tests/auto/qml-qtquicktest/tst_chartview_1_1.qml 0 -4

                     function test_chartViewProperties() {
                         compare(chartView.animationOptions, ChartView.NoAnimation, "ChartView.animationOptions");
                         verify(chartView.backgroundColor != undefined);
-                        verify(chartView.bottomMargin > 0, "ChartView.bottomMargin");
-                        verify(chartView.topMargin > 0, "ChartView.topMargin");
-                        verify(chartView.leftMargin > 0, "ChartView.leftMargin");
-                        verify(chartView.rightMargin > 0, "ChartView.rightMargin");
                         compare(chartView.count, 0, "ChartView.count");
                         compare(chartView.dropShadowEnabled, false, "ChartView.dropShadowEnabled");
                         verify(chartView.plotArea.height > 0, "ChartView.plotArea.height");

tests/auto/qvalueaxis/tst_qvalueaxis.cpp 0 -2

                 QVERIFY(qFuzzyCompare(m_valuesaxis->max(), 0));
                 QVERIFY(qFuzzyCompare(m_valuesaxis->min(), 0));
-                QCOMPARE(m_valuesaxis->niceNumbersEnabled(), false);
                 QCOMPARE(m_valuesaxis->tickCount(), 5);
                 QCOMPARE(m_valuesaxis->type(), QAbstractAxis::AxisTypeValue);
                 QVERIFY(!qFuzzyCompare(m_valuesaxis->max(), 0));
                 QVERIFY(!qFuzzyCompare(m_valuesaxis->min(), 0));
-                QCOMPARE(m_valuesaxis->niceNumbersEnabled(), false);
                 QCOMPARE(m_valuesaxis->tickCount(), 5);
             }

tests/manual/chartwidgettest/mainwidget.cpp +1 -1

                 // Create chart view with the chart
                 m_chartView = new QChartView(m_chart, this);
-                m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
+                m_chartView->setRubberBand(QChartView::HorizontalRubberBand);
                 // Another grid layout as a main layout
                 QGridLayout *mainLayout = new QGridLayout();

tests/manual/polarcharttest/mainwindow.cpp 0 -20

                 m_plotAreaBackgroundBrush(new QBrush(Qt::NoBrush)),
                 m_angularShadesPen(new QPen(Qt::NoPen)),
                 m_radialShadesPen(new QPen(Qt::NoPen)),
-                m_labelPen(new QPen(Qt::NoPen)),
-                m_titlePen(new QPen(Qt::NoPen)),
                 m_gridPen(new QPen(QRgb(0x010101))),  // Note: Pure black is default color, so it gets overridden by
                 m_arrowPen(new QPen(QRgb(0x010101))), // default theme if set to that initially. This is an example of workaround.
                 m_backgroundPen(new QPen(Qt::NoPen)),
                 m_angularAxis->setLabelsAngle(m_labelsAngle);
                 m_angularAxis->setLabelsFont(m_currentLabelFont);
                 m_angularAxis->setLabelsBrush(*m_labelBrush);
-                m_angularAxis->setLabelsPen(*m_labelPen);
                 m_angularAxis->setLabelsVisible(m_labelsVisible);
                 m_angularAxis->setShadesBrush(*m_angularShadesBrush);
                 m_angularAxis->setShadesPen(*m_angularShadesPen);
                 m_angularAxis->setShadesVisible(m_angularShadesVisible);
                 m_angularAxis->setTitleFont(m_currentTitleFont);
                 m_angularAxis->setTitleBrush(*m_titleBrush);
-                m_angularAxis->setTitlePen(*m_titlePen);
                 m_angularAxis->setTitleVisible(m_titleVisible);
                 m_angularAxis->setTitleText(m_angularTitle);
                 m_angularAxis->setGridLinePen(*m_gridPen);
                 m_radialAxis->setLabelsAngle(m_labelsAngle);
                 m_radialAxis->setLabelsFont(m_currentLabelFont);
                 m_radialAxis->setLabelsBrush(*m_labelBrush);
-                m_radialAxis->setLabelsPen(*m_labelPen);
                 m_radialAxis->setLabelsVisible(m_labelsVisible);
                 m_radialAxis->setShadesBrush(*m_radialShadesBrush);
                 m_radialAxis->setShadesPen(*m_radialShadesPen);
                 m_radialAxis->setShadesVisible(m_radialShadesVisible);
                 m_radialAxis->setTitleFont(m_currentTitleFont);
                 m_radialAxis->setTitleBrush(*m_titleBrush);
-                m_radialAxis->setTitlePen(*m_titlePen);
                 m_radialAxis->setTitleVisible(m_titleVisible);
                 m_radialAxis->setTitleText(m_radialTitle);
                 m_radialAxis->setGridLinePen(*m_gridPen);
             void MainWindow::labelsIndexChanged(int index)
             {
                 delete m_labelBrush;
-                delete m_labelPen;
                 switch (index) {
                 case 0:
                     m_labelBrush = new QBrush(Qt::NoBrush);
-                    m_labelPen = new QPen(Qt::NoPen);
                     m_labelsVisible = false;
                     break;
                 case 1:
                     m_labelBrush = new QBrush(Qt::black);
-                    m_labelPen = new QPen(Qt::NoPen);
                     m_labelsVisible = true;
                     break;
                 case 2:
                     m_labelBrush = new QBrush(Qt::white);
-                    m_labelPen = new QPen(Qt::blue);
                     m_labelsVisible = true;
                     break;
                 default:
                 }
                 m_radialAxis->setLabelsBrush(*m_labelBrush);
-                m_radialAxis->setLabelsPen(*m_labelPen);
                 m_radialAxis->setLabelsVisible(m_labelsVisible);
                 m_angularAxis->setLabelsBrush(*m_labelBrush);
-                m_angularAxis->setLabelsPen(*m_labelPen);
                 m_angularAxis->setLabelsVisible(m_labelsVisible);
             }
             void MainWindow::titleIndexChanged(int index)
             {
                 delete m_titleBrush;
-                delete m_titlePen;
                 switch (index) {
                 case 0:
                     m_titleBrush = new QBrush(Qt::NoBrush);
-                    m_titlePen = new QPen(Qt::NoPen);
                     m_titleVisible = false;
                     m_angularTitle = QString();
                     m_radialTitle = QString();
                     break;
                 case 1:
                     m_titleBrush = new QBrush(Qt::NoBrush);
-                    m_titlePen = new QPen(Qt::NoPen);
                     m_titleVisible = true;
                     m_angularTitle = QString();
                     m_radialTitle = QString();
                     break;
                 case 2:
                     m_titleBrush = new QBrush(Qt::NoBrush);
-                    m_titlePen = new QPen(Qt::NoPen);
                     m_titleVisible = false;
                     m_angularTitle = QString("Invisible Ang. Title!");
                     m_radialTitle = QString("Invisible Rad. Title!");
                     break;
                 case 3:
                     m_titleBrush = new QBrush(Qt::black);
-                    m_titlePen = new QPen(Qt::NoPen);
                     m_titleVisible = true;
                     m_angularTitle = QString("Angular Title");
                     m_radialTitle = QString("Radial Title");
                     break;
                 case 4:
                     m_titleBrush = new QBrush(Qt::white);
-                    m_titlePen = new QPen(Qt::blue);
                     m_titleVisible = true;
                     m_angularTitle = QString("Angular Blue Title");
                     m_radialTitle = QString("Radial Blue Title");
                 }
                 m_radialAxis->setTitleBrush(*m_titleBrush);
-                m_radialAxis->setTitlePen(*m_titlePen);
                 m_radialAxis->setTitleVisible(m_titleVisible);
                 m_radialAxis->setTitleText(m_radialTitle);
                 m_angularAxis->setTitleBrush(*m_titleBrush);
-                m_angularAxis->setTitlePen(*m_titlePen);
                 m_angularAxis->setTitleVisible(m_titleVisible);
                 m_angularAxis->setTitleText(m_angularTitle);
             }

tests/manual/polarcharttest/mainwindow.h 0 -2

                 QBrush *m_plotAreaBackgroundBrush;
                 QPen *m_angularShadesPen;
                 QPen *m_radialShadesPen;
-                QPen *m_labelPen;
-                QPen *m_titlePen;
                 QPen *m_gridPen;
                 QPen *m_arrowPen;
                 QPen *m_backgroundPen;

tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml 0 -4

                             text: "Default + User defined"
                             onClicked: viewName = "DefaultAndUserDefined";
                         }
-                        Button {
-                            text: "Legacy"
-                            onClicked: viewName = "Legacy";
                     }
                 }
             }

tests/manual/qmlchartaxis/resources.qrc 0 -1

                     <file>qml/qmlchartaxis/CreatingDynamically.qml</file>
                     <file>qml/qmlchartaxis/SwitchingDynamically.qml</file>
                     <file>qml/qmlchartaxis/DefaultAndUserDefined.qml</file>
-                    <file>qml/qmlchartaxis/Legacy.qml</file>
                 </qresource>
             </RCC>

tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml +4 -4

                     color: "transparent"
                     border.color: "red"
                     anchors.fill: parent
-                    anchors.topMargin: chartView.minimumMargins.top
+                    anchors.topMargin: chartView.margins.top
-                    anchors.bottomMargin: chartView.minimumMargins.bottom
+                    anchors.bottomMargin: chartView.margins.bottom
-                    anchors.leftMargin: chartView.minimumMargins.left
+                    anchors.leftMargin: chartView.margins.left
-                    anchors.rightMargin: chartView.minimumMargins.right
+                    anchors.rightMargin: chartView.margins.right
                     opacity: 0.0
                     onOpacityChanged: if (opacity > 0.9) opacity = 0.0;
                     Behavior on opacity {

tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml 0 -4

                         onClicked: axis.tickCount--;
                     }
-                    Button {
-                        text: "axis nice nmb"
-                        onClicked: axis.niceNumbersEnabled = !axis.niceNumbersEnabled;
                     FontEditor {
                         id: fontEditor

tests/manual/qmlchartaxis/qml/qmlchartaxis/Legacy.qml removed 0 -54

NO CONTENT: file was removed

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