HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2898:03a6177a3223

.qmake.conf 0 -1

             load(qt_build_config)
-            CONFIG += qt_example_installs
             MODULE_VERSION=5.7.0

src/charts/animations/animations.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/axisanimation.cpp \

src/charts/areachart/areachart.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/areachartitem.cpp \

src/charts/axis/axis.pri 0 -9

                 $$PWD/categoryaxis \
                 $$PWD/logvalueaxis
-            DEPENDPATH += $$PWD \
-                $$PWD/valueaxis \
-                $$PWD/barcategoryaxis \
-                $$PWD/categoryaxis \
-                $$PWD/logvalueaxis
             SOURCES += \
                 $$PWD/chartaxiselement.cpp \
                 $$PWD/cartesianchartaxis.cpp \
             INCLUDEPATH += \
                 $$PWD/datetimeaxis
-            DEPENDPATH += \
-                $$PWD/datetimeaxis
             SOURCES += \
                 $$PWD/datetimeaxis/chartdatetimeaxisx.cpp \
                 $$PWD/datetimeaxis/chartdatetimeaxisy.cpp \

src/charts/barchart/barchart.pri 0 -8

                 $$PWD/horizontal/stacked \
                 $$PWD/horizontal/percent
-            DEPENDPATH += $$PWD \
-                $$PWD/vertical/bar \
-                $$PWD/vertical/stacked \
-                $$PWD/vertical/percent \
-                $$PWD/horizontal/bar \
-                $$PWD/horizontal/stacked \
-                $$PWD/horizontal/percent
             SOURCES += \
                 $$PWD/bar.cpp \
                 $$PWD/abstractbarchartitem.cpp \

src/charts/boxplotchart/boxplotchart.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/boxplotchartitem.cpp \

src/charts/charts.pro +2 -10

             TARGET = QtCharts
-            message($$QT_CONFIG)
             QT = core gui widgets
-            DEFINES += QT_CHARTS_LIBRARY
             contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
-            # Fix exports in static builds for applications linking charts module
-            static: MODULE_DEFINES += QT_CHARTS_STATICLIB
-            MODULE_INCNAME = QtCharts
             QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf
-            load(qt_module)
             QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
             QMAKE_TARGET_DESCRIPTION = "Charts component for Qt."
                 $$PWD/chartsnamespace.h \
                 $$PWD/qpolarchart.h
-            include($$PWD/common.pri)
             include($$PWD/animations/animations.pri)
             include($$PWD/areachart/areachart.pri)
             include($$PWD/axis/axis.pri)
                 # ChartThemeSystem uses Windows native API
                 LIBS += -luser32
             }
+            load(qt_module)

src/charts/domain/domain.pri 0 -1

             #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well.
             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/abstractdomain.cpp \

src/charts/layout/layout.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/abstractchartlayout.cpp \

src/charts/legend/legend.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qlegend.cpp \

src/charts/linechart/linechart.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/linechartitem.cpp \

src/charts/piechart/piechart.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qpieseries.cpp \

src/charts/qchartglobal.h +8 -9

@@ -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	# define QT_CHARTS_EXPORT Q_DECL_EXPORT	46	# if defined(QT_BUILD_CHARTS_LIB)
		47	# define QT_CHARTS_EXPORT Q_DECL_EXPORT
		48	# else
		49	# define QT_CHARTS_EXPORT Q_DECL_IMPORT
		50	# endif
47	#else	51	#else
48	# define QT_CHARTS_EXPORT Q_DECL_IMPORT
49	#endif
50
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

src/charts/scatterchart/scatter.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qscatterseries.cpp \

src/charts/splinechart/splinechart.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qsplineseries.cpp \

src/charts/themes/themes.pri 0 -1

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             THEMES += \
                 $$PWD/charttheme_p.h \

src/charts/xychart/xychart.pri +1 -2

-            #INCLUDEPATH += $$PWD
+            INCLUDEPATH += $$PWD
-            #DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/xychart.cpp \

src/chartsqml2/chartsqml2.pro +2 -22

             TARGET = qtchartsqml2
+            CXX_MODULE = charts
             QT += qml quick
             QT += charts charts-private
-            TARGETPATH = QtCharts
             contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
-            IMPORT_VERSION = $$MODULE_VERSION
-            # Only build qml plugin static if Qt itself is also built static
-            !contains(QT_CONFIG, static): CONFIG -= static staticlib
             include($$PWD/designer/designer.pri)
-            INCLUDEPATH += ../../include \
-                           ../../include/QtCharts \
-                           ../charts \
-                           ../charts/animations \
-                           ../charts/axis \
-                           ../charts/domain
             SOURCES += \
                 chartsqml2_plugin.cpp \
                 declarativechart.cpp \
                 declarativechartnode.h \
                 declarativerendernode.h
-            OTHER_FILES = qmldir
-            CONFIG += no_cxx_module
             load(qml_plugin)
             win32 {
-                CONFIG += skip_target_version_ext
-                VERSION = $$MODULE_VERSION
                 QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
                 QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt."
             }
-            QML_FILES += \
-                $$PWD/plugins.qmltypes

src/charts/common.pri removed 0 -15

NO CONTENT: file was removed

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages