diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:54 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:54 +0100 |
| commit | d63f5bd20034812b7661d6f2beb7f0025333953d (patch) | |
| tree | cf7d7599e642ce817811550d25b5eaf012be35ca /src | |
| parent | 0b346ad80094dc431c14dd07c83814ae558f7a37 (diff) | |
| parent | 9ea91c6e6cdcdb43cf45ddb6c96c2e39e8995904 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I8eb3b65e2d45d0aced218605d47ef99c92aa5511
Diffstat (limited to 'src')
| -rw-r--r-- | src/charts/layout/cartesianchartlayout.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/charts/layout/cartesianchartlayout.cpp b/src/charts/layout/cartesianchartlayout.cpp index e8ce329a..5e32c2e1 100644 --- a/src/charts/layout/cartesianchartlayout.cpp +++ b/src/charts/layout/cartesianchartlayout.cpp @@ -49,6 +49,7 @@ QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList<ChartAxisElement *> &axes, bool update) const { + Q_UNUSED(update) QSizeF left(0,0); QSizeF minLeft(0,0); QSizeF right(0,0); |