@@ -3,9 +3,6 | |||||
3 | TARGET = QtCharts |
|
3 | TARGET = QtCharts | |
4 |
|
4 | |||
5 | QT = core gui widgets |
|
5 | QT = core gui widgets | |
6 | DEFINES += QT_CHARTS_LIBRARY |
|
|||
7 | # Fix exports in static builds for applications linking charts module |
|
|||
8 | static: MODULE_DEFINES += QT_CHARTS_STATICLIB |
|
|||
9 |
|
6 | |||
10 | QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf |
|
7 | QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf | |
11 |
|
8 |
@@ -34,26 +34,24 | |||||
34 | */ |
|
34 | */ | |
35 | #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) |
|
35 | #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) | |
36 |
|
36 | |||
37 | #if defined(QT_CHARTS_LIBRARY) |
|
37 | #ifndef QT_STATIC | |
|
38 | # if defined(QT_BUILD_CHARTS_LIB) | |||
38 | # define QT_CHARTS_EXPORT Q_DECL_EXPORT |
|
39 | # define QT_CHARTS_EXPORT Q_DECL_EXPORT | |
39 | #else |
|
40 | # else | |
40 | # define QT_CHARTS_EXPORT Q_DECL_IMPORT |
|
41 | # define QT_CHARTS_EXPORT Q_DECL_IMPORT | |
41 | #endif |
|
42 | # endif | |
|
43 | #else | |||
|
44 | # define QT_CHARTS_EXPORT | |||
|
45 | #endif | |||
42 |
|
46 | |||
43 |
#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIB |
|
47 | #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_BUILD_CHARTS_LIB) | |
44 | # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT |
|
48 | # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT | |
45 |
#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIB |
|
49 | #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_BUILD_CHARTS_LIB) | |
46 | # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT |
|
50 | # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT | |
47 | #else |
|
51 | #else | |
48 | # define QT_CHARTS_AUTOTEST_EXPORT |
|
52 | # define QT_CHARTS_AUTOTEST_EXPORT | |
49 | #endif |
|
53 | #endif | |
50 |
|
54 | |||
51 | #ifdef QT_CHARTS_STATICLIB |
|
|||
52 | # undef QT_CHARTS_EXPORT |
|
|||
53 | # undef QT_CHARTS_AUTOTEST_EXPORT |
|
|||
54 | # define QT_CHARTS_EXPORT |
|
|||
55 | # define QT_CHARTS_AUTOTEST_EXPORT |
|
|||
56 | #endif |
|
|||
57 |
|
55 | |||
58 | #define QT_CHARTS_NAMESPACE QtCharts |
|
56 | #define QT_CHARTS_NAMESPACE QtCharts | |
59 |
|
57 |
General Comments 0
You need to be logged in to leave comments.
Login now