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

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

Correct file version, description, and product name for Qt Charts...
Antti Kokko -
r2809:3922a511f022
parent child
Show More
Side by Side Unified
Context file:
r2809:3922a511f022 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,92 +1,95
1 ############################# BUILD CONFIG ######################################
1 ############################# BUILD CONFIG ######################################
2
2
3 TARGET = QtCharts
3 TARGET = QtCharts
4
4
5 message($$QT_CONFIG)
5 message($$QT_CONFIG)
6 QT = core gui widgets
6 QT = core gui widgets
7 DEFINES += QT_CHARTS_LIBRARY
7 DEFINES += QT_CHARTS_LIBRARY
8 # Fix exports in static builds for applications linking charts module
8 # Fix exports in static builds for applications linking charts module
9 static: MODULE_DEFINES += QT_CHARTS_STATICLIB
9 static: MODULE_DEFINES += QT_CHARTS_STATICLIB
10
10
11 MODULE_INCNAME = QtCharts
11 MODULE_INCNAME = QtCharts
12
12
13 QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf
13 QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf
14
14
15 load(qt_module)
15 load(qt_module)
16
16
17 QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
18 QMAKE_TARGET_DESCRIPTION = "Charts component for Qt."
19
17 ############################# SOURCES ##########################################
20 ############################# SOURCES ##########################################
18
21
19 SOURCES += \
22 SOURCES += \
20 $$PWD/chartdataset.cpp \
23 $$PWD/chartdataset.cpp \
21 $$PWD/chartpresenter.cpp \
24 $$PWD/chartpresenter.cpp \
22 $$PWD/chartthememanager.cpp \
25 $$PWD/chartthememanager.cpp \
23 $$PWD/qchart.cpp \
26 $$PWD/qchart.cpp \
24 $$PWD/qchartview.cpp \
27 $$PWD/qchartview.cpp \
25 $$PWD/qabstractseries.cpp \
28 $$PWD/qabstractseries.cpp \
26 $$PWD/chartbackground.cpp \
29 $$PWD/chartbackground.cpp \
27 $$PWD/chartelement.cpp \
30 $$PWD/chartelement.cpp \
28 $$PWD/chartitem.cpp \
31 $$PWD/chartitem.cpp \
29 $$PWD/scroller.cpp \
32 $$PWD/scroller.cpp \
30 $$PWD/charttitle.cpp \
33 $$PWD/charttitle.cpp \
31 $$PWD/qpolarchart.cpp
34 $$PWD/qpolarchart.cpp
32 PRIVATE_HEADERS += \
35 PRIVATE_HEADERS += \
33 $$PWD/chartdataset_p.h \
36 $$PWD/chartdataset_p.h \
34 $$PWD/chartitem_p.h \
37 $$PWD/chartitem_p.h \
35 $$PWD/chartpresenter_p.h \
38 $$PWD/chartpresenter_p.h \
36 $$PWD/chartthememanager_p.h \
39 $$PWD/chartthememanager_p.h \
37 $$PWD/chartbackground_p.h \
40 $$PWD/chartbackground_p.h \
38 $$PWD/chartelement_p.h \
41 $$PWD/chartelement_p.h \
39 $$PWD/chartconfig_p.h \
42 $$PWD/chartconfig_p.h \
40 $$PWD/qchart_p.h \
43 $$PWD/qchart_p.h \
41 $$PWD/qchartview_p.h \
44 $$PWD/qchartview_p.h \
42 $$PWD/scroller_p.h \
45 $$PWD/scroller_p.h \
43 $$PWD/qabstractseries_p.h \
46 $$PWD/qabstractseries_p.h \
44 $$PWD/charttitle_p.h \
47 $$PWD/charttitle_p.h \
45 $$PWD/charthelpers_p.h
48 $$PWD/charthelpers_p.h
46 PUBLIC_HEADERS += \
49 PUBLIC_HEADERS += \
47 $$PWD/qchart.h \
50 $$PWD/qchart.h \
48 $$PWD/qchartglobal.h \
51 $$PWD/qchartglobal.h \
49 $$PWD/qabstractseries.h \
52 $$PWD/qabstractseries.h \
50 $$PWD/qchartview.h \
53 $$PWD/qchartview.h \
51 $$PWD/chartsnamespace.h \
54 $$PWD/chartsnamespace.h \
52 $$PWD/qpolarchart.h
55 $$PWD/qpolarchart.h
53
56
54 include($$PWD/common.pri)
57 include($$PWD/common.pri)
55 include($$PWD/animations/animations.pri)
58 include($$PWD/animations/animations.pri)
56 include($$PWD/areachart/areachart.pri)
59 include($$PWD/areachart/areachart.pri)
57 include($$PWD/axis/axis.pri)
60 include($$PWD/axis/axis.pri)
58 include($$PWD/domain/domain.pri)
61 include($$PWD/domain/domain.pri)
59 include($$PWD/barchart/barchart.pri)
62 include($$PWD/barchart/barchart.pri)
60 include($$PWD/legend/legend.pri)
63 include($$PWD/legend/legend.pri)
61 include($$PWD/linechart/linechart.pri)
64 include($$PWD/linechart/linechart.pri)
62 include($$PWD/piechart/piechart.pri)
65 include($$PWD/piechart/piechart.pri)
63 include($$PWD/scatterchart/scatter.pri)
66 include($$PWD/scatterchart/scatter.pri)
64 include($$PWD/splinechart/splinechart.pri)
67 include($$PWD/splinechart/splinechart.pri)
65 include($$PWD/themes/themes.pri)
68 include($$PWD/themes/themes.pri)
66 include($$PWD/xychart/xychart.pri)
69 include($$PWD/xychart/xychart.pri)
67 include($$PWD/layout/layout.pri)
70 include($$PWD/layout/layout.pri)
68 include($$PWD/boxplotchart/boxplotchart.pri)
71 include($$PWD/boxplotchart/boxplotchart.pri)
69
72
70 HEADERS += $$PUBLIC_HEADERS
73 HEADERS += $$PUBLIC_HEADERS
71 HEADERS += $$PRIVATE_HEADERS
74 HEADERS += $$PRIVATE_HEADERS
72 HEADERS += $$THEMES
75 HEADERS += $$THEMES
73
76
74 OTHER_FILES += doc/qtcharts.qdocconf \
77 OTHER_FILES += doc/qtcharts.qdocconf \
75 doc/src/* \
78 doc/src/* \
76 doc/images/*
79 doc/images/*
77
80
78 #Define for unit tests
81 #Define for unit tests
79 CONFIG(debug, debug|release) {
82 CONFIG(debug, debug|release) {
80 DEFINES += BUILD_PRIVATE_UNIT_TESTS
83 DEFINES += BUILD_PRIVATE_UNIT_TESTS
81 }
84 }
82
85
83 msvc {
86 msvc {
84 # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit
87 # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit
85 # builds resulting from usage of str::sort
88 # builds resulting from usage of str::sort
86 QMAKE_CXXFLAGS_WARN_ON += -wd4267
89 QMAKE_CXXFLAGS_WARN_ON += -wd4267
87 }
90 }
88
91
89 win32:!winrt:!wince {
92 win32:!winrt:!wince {
90 # ChartThemeSystem uses Windows native API
93 # ChartThemeSystem uses Windows native API
91 LIBS += -luser32
94 LIBS += -luser32
92 }
95 }
Show file before | Show file after | Hide comments
@@ -1,71 +1,78
1
1
2 TARGET = qtchartsqml2
2 TARGET = qtchartsqml2
3 QT += qml quick
3 QT += qml quick
4 QT += charts charts-private
4 QT += charts charts-private
5 TARGETPATH = QtCharts
5 TARGETPATH = QtCharts
6
6
7 IMPORT_VERSION = $$MODULE_VERSION
7 IMPORT_VERSION = $$MODULE_VERSION
8
8
9 # Only build qml plugin static if Qt itself is also built static
9 # Only build qml plugin static if Qt itself is also built static
10 !contains(QT_CONFIG, static): CONFIG -= static staticlib
10 !contains(QT_CONFIG, static): CONFIG -= static staticlib
11
11
12 include($$PWD/designer/designer.pri)
12 include($$PWD/designer/designer.pri)
13
13
14 INCLUDEPATH += ../../include \
14 INCLUDEPATH += ../../include \
15 ../../include/QtCharts \
15 ../../include/QtCharts \
16 ../charts \
16 ../charts \
17 ../charts/animations \
17 ../charts/animations \
18 ../charts/axis \
18 ../charts/axis \
19 ../charts/domain
19 ../charts/domain
20
20
21 SOURCES += \
21 SOURCES += \
22 chartsqml2_plugin.cpp \
22 chartsqml2_plugin.cpp \
23 declarativechart.cpp \
23 declarativechart.cpp \
24 declarativexypoint.cpp \
24 declarativexypoint.cpp \
25 declarativexyseries.cpp \
25 declarativexyseries.cpp \
26 declarativelineseries.cpp \
26 declarativelineseries.cpp \
27 declarativesplineseries.cpp \
27 declarativesplineseries.cpp \
28 declarativeareaseries.cpp \
28 declarativeareaseries.cpp \
29 declarativescatterseries.cpp \
29 declarativescatterseries.cpp \
30 declarativepieseries.cpp \
30 declarativepieseries.cpp \
31 declarativebarseries.cpp \
31 declarativebarseries.cpp \
32 declarativecategoryaxis.cpp \
32 declarativecategoryaxis.cpp \
33 declarativemargins.cpp \
33 declarativemargins.cpp \
34 declarativeaxes.cpp \
34 declarativeaxes.cpp \
35 declarativepolarchart.cpp \
35 declarativepolarchart.cpp \
36 declarativeboxplotseries.cpp
36 declarativeboxplotseries.cpp
37
37
38 HEADERS += \
38 HEADERS += \
39 declarativechart.h \
39 declarativechart.h \
40 declarativexypoint.h \
40 declarativexypoint.h \
41 declarativexyseries.h \
41 declarativexyseries.h \
42 declarativelineseries.h \
42 declarativelineseries.h \
43 declarativesplineseries.h \
43 declarativesplineseries.h \
44 declarativeareaseries.h \
44 declarativeareaseries.h \
45 declarativescatterseries.h \
45 declarativescatterseries.h \
46 declarativepieseries.h \
46 declarativepieseries.h \
47 declarativebarseries.h \
47 declarativebarseries.h \
48 declarativecategoryaxis.h \
48 declarativecategoryaxis.h \
49 declarativemargins.h \
49 declarativemargins.h \
50 declarativeaxes.h \
50 declarativeaxes.h \
51 declarativepolarchart.h \
51 declarativepolarchart.h \
52 declarativeboxplotseries.h
52 declarativeboxplotseries.h
53
53
54 OTHER_FILES = qmldir
54 OTHER_FILES = qmldir
55
55
56 CONFIG += no_cxx_module
56 CONFIG += no_cxx_module
57
57
58 load(qml_plugin)
58 load(qml_plugin)
59
59
60 win32 {
61 CONFIG += skip_target_version_ext
62 VERSION = $$MODULE_VERSION
63 QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
64 QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt."
65 }
66
60 # Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples
67 # Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples
61 # without having to do 'make install'.
68 # without having to do 'make install'.
62 !android:!ios {
69 !android:!ios {
63 copy_qmldir.target = $$DESTDIR/qmldir
70 copy_qmldir.target = $$DESTDIR/qmldir
64 copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
71 copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
65 copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
72 copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
66 QMAKE_EXTRA_TARGETS += copy_qmldir
73 QMAKE_EXTRA_TARGETS += copy_qmldir
67 PRE_TARGETDEPS += $$copy_qmldir.target
74 PRE_TARGETDEPS += $$copy_qmldir.target
68 }
75 }
69
76
70 QML_FILES += \
77 QML_FILES += \
71 $$PWD/plugins.qmltypes
78 $$PWD/plugins.qmltypes
General Comments 0
You need to be logged in to leave comments. Login now