##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fix BC: QChart::setMinimumMargins and QChart::minimumMargins are in v1.1.0 so they have to stay.
Jani Honkonen -
r2272:b1616762bd1e old_master
parent child
Show More
Side by Side Unified
Context file:
r2272:b1616762bd1e Loading diff...:
Show file before | Show file after | Hide comments
@@ -368,6 +368,27 QLegend *QChart::legend() const
368
368
369 /*!
369 /*!
370 Sets the minimum \a margins between the plot area (axes) and the edge of the chart widget.
370 Sets the minimum \a margins between the plot area (axes) and the edge of the chart widget.
371 Deprecated. Use setMargins().
372 */
373 void QChart::setMinimumMargins(const QMargins &margins)
374 {
375 qWarning() << "QChart::setMinimumMargins is deprecated. Use QChart::setMargins instead.";
376 d_ptr->m_presenter->layout()->setMargins(margins);
377 }
378
379 /*!
380 Returns the rect that contains information about margins (distance between chart widget edge and axes).
381 Individual margins can be obtained by calling left, top, right, bottom on the returned rect.
382 Deprecated. Use margins().
383 */
384 QMargins QChart::minimumMargins() const
385 {
386 qWarning() << "QChart::minimumMargins is deprecated. Use QChart::margins instead.";
387 return d_ptr->m_presenter->layout()->margins();
388 }
389
390 /*!
391 Sets the minimum \a margins between the plot area (axes) and the edge of the chart widget.
371 */
392 */
372 void QChart::setMargins(const QMargins &margins)
393 void QChart::setMargins(const QMargins &margins)
373 {
394 {
Show file before | Show file after | Hide comments
@@ -114,6 +114,9 public:
114
114
115 QLegend *legend() const;
115 QLegend *legend() const;
116
116
117 void setMinimumMargins(const QMargins& margins);
118 QMargins minimumMargins() const;
119
117 void setMargins(const QMargins &margins);
120 void setMargins(const QMargins &margins);
118 QMargins margins() const;
121 QMargins margins() const;
119
122
General Comments 0
You need to be logged in to leave comments. Login now