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

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

Merge remote-tracking branch 'origin/5.6' into 5.7...
Liang Qi -
r2898:03a6177a3223 merge master
parent child
Show More
Side by Side Unified
Context file:
r2898:03a6177a3223 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,4 +1,3
1 load(qt_build_config)
1 load(qt_build_config)
2 CONFIG += qt_example_installs
3
2
4 MODULE_VERSION=5.7.0
3 MODULE_VERSION=5.7.0
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/axisanimation.cpp \
4 $$PWD/axisanimation.cpp \
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/areachartitem.cpp \
4 $$PWD/areachartitem.cpp \
Show file before | Show file after | Hide comments
@@ -6,12 +6,6 INCLUDEPATH += $$PWD \
6 $$PWD/categoryaxis \
6 $$PWD/categoryaxis \
7 $$PWD/logvalueaxis
7 $$PWD/logvalueaxis
8
8
9 DEPENDPATH += $$PWD \
10 $$PWD/valueaxis \
11 $$PWD/barcategoryaxis \
12 $$PWD/categoryaxis \
13 $$PWD/logvalueaxis
14
15 SOURCES += \
9 SOURCES += \
16 $$PWD/chartaxiselement.cpp \
10 $$PWD/chartaxiselement.cpp \
17 $$PWD/cartesianchartaxis.cpp \
11 $$PWD/cartesianchartaxis.cpp \
@@ -85,9 +79,6 PRIVATE_HEADERS += \
85 INCLUDEPATH += \
79 INCLUDEPATH += \
86 $$PWD/datetimeaxis
80 $$PWD/datetimeaxis
87
81
88 DEPENDPATH += \
89 $$PWD/datetimeaxis
90
91 SOURCES += \
82 SOURCES += \
92 $$PWD/datetimeaxis/chartdatetimeaxisx.cpp \
83 $$PWD/datetimeaxis/chartdatetimeaxisx.cpp \
93 $$PWD/datetimeaxis/chartdatetimeaxisy.cpp \
84 $$PWD/datetimeaxis/chartdatetimeaxisy.cpp \
Show file before | Show file after | Hide comments
@@ -8,14 +8,6 INCLUDEPATH += $$PWD \
8 $$PWD/horizontal/stacked \
8 $$PWD/horizontal/stacked \
9 $$PWD/horizontal/percent
9 $$PWD/horizontal/percent
10
10
11 DEPENDPATH += $$PWD \
12 $$PWD/vertical/bar \
13 $$PWD/vertical/stacked \
14 $$PWD/vertical/percent \
15 $$PWD/horizontal/bar \
16 $$PWD/horizontal/stacked \
17 $$PWD/horizontal/percent
18
19 SOURCES += \
11 SOURCES += \
20 $$PWD/bar.cpp \
12 $$PWD/bar.cpp \
21 $$PWD/abstractbarchartitem.cpp \
13 $$PWD/abstractbarchartitem.cpp \
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/boxplotchartitem.cpp \
4 $$PWD/boxplotchartitem.cpp \
Show file before | Show file after | Hide comments
@@ -2,20 +2,11
2
2
3 TARGET = QtCharts
3 TARGET = QtCharts
4
4
5 message($$QT_CONFIG)
6 QT = core gui widgets
5 QT = core gui widgets
7 DEFINES += QT_CHARTS_LIBRARY
8 contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
6 contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
9
7
10 # Fix exports in static builds for applications linking charts module
11 static: MODULE_DEFINES += QT_CHARTS_STATICLIB
12
13 MODULE_INCNAME = QtCharts
14
15 QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf
8 QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf
16
9
17 load(qt_module)
18
19 QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
10 QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
20 QMAKE_TARGET_DESCRIPTION = "Charts component for Qt."
11 QMAKE_TARGET_DESCRIPTION = "Charts component for Qt."
21
12
@@ -62,7 +53,6 PUBLIC_HEADERS += \
62 $$PWD/chartsnamespace.h \
53 $$PWD/chartsnamespace.h \
63 $$PWD/qpolarchart.h
54 $$PWD/qpolarchart.h
64
55
65 include($$PWD/common.pri)
66 include($$PWD/animations/animations.pri)
56 include($$PWD/animations/animations.pri)
67 include($$PWD/areachart/areachart.pri)
57 include($$PWD/areachart/areachart.pri)
68 include($$PWD/axis/axis.pri)
58 include($$PWD/axis/axis.pri)
@@ -96,3 +86,5 win32:!winrt:!wince {
96 # ChartThemeSystem uses Windows native API
86 # ChartThemeSystem uses Windows native API
97 LIBS += -luser32
87 LIBS += -luser32
98 }
88 }
89
90 load(qt_module)
Show file before | Show file after | Hide comments
@@ -1,7 +1,6
1 #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well.
1 #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well.
2
2
3 INCLUDEPATH += $$PWD
3 INCLUDEPATH += $$PWD
4 DEPENDPATH += $$PWD
5
4
6 SOURCES += \
5 SOURCES += \
7 $$PWD/abstractdomain.cpp \
6 $$PWD/abstractdomain.cpp \
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/abstractchartlayout.cpp \
4 $$PWD/abstractchartlayout.cpp \
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/qlegend.cpp \
4 $$PWD/qlegend.cpp \
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/linechartitem.cpp \
4 $$PWD/linechartitem.cpp \
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/qpieseries.cpp \
4 $$PWD/qpieseries.cpp \
Show file before | Show file after | Hide comments
@@ -42,19 +42,18
42 */
42 */
43 #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
43 #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
44
44
45 #if defined(QT_CHARTS_LIBRARY)
45 #ifndef QT_STATIC
46 # if defined(QT_BUILD_CHARTS_LIB)
46 # define QT_CHARTS_EXPORT Q_DECL_EXPORT
47 # define QT_CHARTS_EXPORT Q_DECL_EXPORT
47 #else
48 # else
48 # define QT_CHARTS_EXPORT Q_DECL_IMPORT
49 # define QT_CHARTS_EXPORT Q_DECL_IMPORT
49 #endif
50 # endif
50
51 #else
51 #ifdef QT_CHARTS_STATICLIB
52 # undef QT_CHARTS_EXPORT
53 # undef Q_AUTOTEST_EXPORT
54 # define QT_CHARTS_EXPORT
52 # define QT_CHARTS_EXPORT
55 # define Q_AUTOTEST_EXPORT
56 #endif
53 #endif
57
54
55 #define QT_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT
56
58 #define QT_CHARTS_NAMESPACE QtCharts
57 #define QT_CHARTS_NAMESPACE QtCharts
59
58
60 #ifdef QT_CHARTS_NAMESPACE
59 #ifdef QT_CHARTS_NAMESPACE
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/qscatterseries.cpp \
4 $$PWD/qscatterseries.cpp \
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/qsplineseries.cpp \
4 $$PWD/qsplineseries.cpp \
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
2
4 THEMES += \
3 THEMES += \
5 $$PWD/charttheme_p.h \
4 $$PWD/charttheme_p.h \
Show file before | Show file after | Hide comments
@@ -1,5 +1,4
1 #INCLUDEPATH += $$PWD
1 INCLUDEPATH += $$PWD
2 #DEPENDPATH += $$PWD
3
2
4 SOURCES += \
3 SOURCES += \
5 $$PWD/xychart.cpp \
4 $$PWD/xychart.cpp \
Show file before | Show file after | Hide comments
@@ -1,24 +1,13
1
1
2 TARGET = qtchartsqml2
2 TARGET = qtchartsqml2
3 CXX_MODULE = charts
4
3 QT += qml quick
5 QT += qml quick
4 QT += charts charts-private
6 QT += charts charts-private
5 TARGETPATH = QtCharts
6 contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
7 contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
7
8
8 IMPORT_VERSION = $$MODULE_VERSION
9
10 # Only build qml plugin static if Qt itself is also built static
11 !contains(QT_CONFIG, static): CONFIG -= static staticlib
12
13 include($$PWD/designer/designer.pri)
9 include($$PWD/designer/designer.pri)
14
10
15 INCLUDEPATH += ../../include \
16 ../../include/QtCharts \
17 ../charts \
18 ../charts/animations \
19 ../charts/axis \
20 ../charts/domain
21
22 SOURCES += \
11 SOURCES += \
23 chartsqml2_plugin.cpp \
12 chartsqml2_plugin.cpp \
24 declarativechart.cpp \
13 declarativechart.cpp \
@@ -56,18 +45,9 HEADERS += \
56 declarativechartnode.h \
45 declarativechartnode.h \
57 declarativerendernode.h
46 declarativerendernode.h
58
47
59 OTHER_FILES = qmldir
60
61 CONFIG += no_cxx_module
62
63 load(qml_plugin)
48 load(qml_plugin)
64
49
65 win32 {
50 win32 {
66 CONFIG += skip_target_version_ext
67 VERSION = $$MODULE_VERSION
68 QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
51 QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
69 QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt."
52 QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt."
70 }
53 }
71
72 QML_FILES += \
73 $$PWD/plugins.qmltypes
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now