diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-21 17:41:05 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-22 14:06:49 +0000 |
| commit | c0f0d22a1ae85c7efafb4cee6d0e59effb68262c (patch) | |
| tree | b37ccbaddcfaa3c8d3f1ae5b03dd785189a5446d | |
| parent | b6fe3127201616fbbfd120be9c650445e583dd84 (diff) | |
Fix static building of qml applications using charts
qt_allocate_bar_set must be defined extern in static builds so that
there won't be duplicate symbols. Dynamic builds still require
QT_CHARTS_EXPORT on windows or they won't find the symbol at all.
Task-number: QTBUG-74613
Change-Id: I94e2aa1f7610a49df1f9b18b3d25175ae0490bf3
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| -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 |