diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-23 03:03:19 +0100 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-26 11:01:23 +0200 |
| commit | 2286b0d68cad71bd1c266070377c86ad961bf1ba (patch) | |
| tree | 280060e48b5dcee8735158875f812ba46adb9d9e | |
| parent | fc535855c4f7e2b457b2a71fb3b687855cbfc958 (diff) | |
| parent | c0f0d22a1ae85c7efafb4cee6d0e59effb68262c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I1264624c5d68f41605409af89d4b1f05807a243a
| -rw-r--r-- | src/chartsqml2/declarativechart.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index 5e83c87a..040a8629 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -444,7 +444,7 @@ DeclarativeChart::DeclarativeChart(QChart::ChartType type, QQuickItem *parent) // QTBUG-71013 // The symbol resides in qbarmodelmapper.cpp#548 in the C++ module. // Here, it gets imported and reset to the DeclarativeBarSet allocator -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && !defined(QT_STATIC) QT_CHARTS_EXPORT #else extern |