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

Merge remote-tracking branch 'origin/5.6' into 5.7...

Liang Qi -

r2898:03a6177a3223 master

parent child

Context file:

r2898:03a6177a3223

Collapse all files

.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 \
                 $$PWD/xyanimation.cpp \
                 $$PWD/pieanimation.cpp \
                 $$PWD/piesliceanimation.cpp \
                 $$PWD/splineanimation.cpp \
                 $$PWD/baranimation.cpp \
                 $$PWD/scatteranimation.cpp \
                 $$PWD/boxplotanimation.cpp \
                 $$PWD/boxwhiskersanimation.cpp \
                 $$PWD/chartanimation.cpp
             PRIVATE_HEADERS += \
                 $$PWD/axisanimation_p.h \
                 $$PWD/chartanimation_p.h \
                 $$PWD/xyanimation_p.h \
                 $$PWD/pieanimation_p.h \
                 $$PWD/piesliceanimation_p.h \
                 $$PWD/splineanimation_p.h \
                 $$PWD/baranimation_p.h \
                 $$PWD/scatteranimation_p.h \
                 $$PWD/boxplotanimation_p.h \
                 $$PWD/boxwhiskersanimation_p.h

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

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/areachartitem.cpp \
                 $$PWD/qareaseries.cpp
             PRIVATE_HEADERS += \
                 $$PWD/areachartitem_p.h \
                 $$PWD/qareaseries_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qareaseries.h

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

             #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well.
             INCLUDEPATH += $$PWD \
                 $$PWD/valueaxis \
                 $$PWD/barcategoryaxis \
                 $$PWD/categoryaxis \
                 $$PWD/logvalueaxis
-            DEPENDPATH += $$PWD \
-                $$PWD/valueaxis \
-                $$PWD/barcategoryaxis \
-                $$PWD/categoryaxis \
-                $$PWD/logvalueaxis
             SOURCES += \
                 $$PWD/chartaxiselement.cpp \
                 $$PWD/cartesianchartaxis.cpp \
                 $$PWD/qabstractaxis.cpp \
                 $$PWD/verticalaxis.cpp \
                 $$PWD/horizontalaxis.cpp \
                 $$PWD/valueaxis/chartvalueaxisx.cpp \
                 $$PWD/valueaxis/chartvalueaxisy.cpp \
                 $$PWD/valueaxis/qvalueaxis.cpp \
                 $$PWD/barcategoryaxis/chartbarcategoryaxisx.cpp \
                 $$PWD/barcategoryaxis/chartbarcategoryaxisy.cpp \
                 $$PWD/barcategoryaxis/qbarcategoryaxis.cpp \
                 $$PWD/categoryaxis/chartcategoryaxisx.cpp \
                 $$PWD/categoryaxis/chartcategoryaxisy.cpp \
                 $$PWD/categoryaxis/qcategoryaxis.cpp \
                 $$PWD/logvalueaxis/chartlogvalueaxisx.cpp \
                 $$PWD/logvalueaxis/chartlogvalueaxisy.cpp \
                 $$PWD/logvalueaxis/qlogvalueaxis.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartaxiselement_p.h \
                 $$PWD/cartesianchartaxis_p.h \
                 $$PWD/qabstractaxis_p.h \
                 $$PWD/verticalaxis_p.h \
                 $$PWD/horizontalaxis_p.h \
                 $$PWD/linearrowitem_p.h \
                 $$PWD/valueaxis/chartvalueaxisx_p.h \
                 $$PWD/valueaxis/chartvalueaxisy_p.h \
                 $$PWD/valueaxis/qvalueaxis_p.h \
                 $$PWD/barcategoryaxis/chartbarcategoryaxisx_p.h \
                 $$PWD/barcategoryaxis/chartbarcategoryaxisy_p.h \
                 $$PWD/barcategoryaxis/qbarcategoryaxis_p.h \
                 $$PWD/categoryaxis/chartcategoryaxisx_p.h \
                 $$PWD/categoryaxis/chartcategoryaxisy_p.h \
                 $$PWD/categoryaxis/qcategoryaxis_p.h \
                 $$PWD/logvalueaxis/chartlogvalueaxisx_p.h \
                 $$PWD/logvalueaxis/chartlogvalueaxisy_p.h \
                 $$PWD/logvalueaxis/qlogvalueaxis_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qabstractaxis.h \
                 $$PWD/valueaxis/qvalueaxis.h \
                 $$PWD/barcategoryaxis/qbarcategoryaxis.h \
                 $$PWD/categoryaxis/qcategoryaxis.h \
                 $$PWD/logvalueaxis/qlogvalueaxis.h \
             # polar
             SOURCES += \
                 $$PWD/polarchartaxis.cpp \
                 $$PWD/polarchartaxisangular.cpp \
                 $$PWD/polarchartaxisradial.cpp \
                 $$PWD/valueaxis/polarchartvalueaxisangular.cpp \
                 $$PWD/valueaxis/polarchartvalueaxisradial.cpp \
                 $$PWD/logvalueaxis/polarchartlogvalueaxisangular.cpp \
                 $$PWD/logvalueaxis/polarchartlogvalueaxisradial.cpp \
                 $$PWD/categoryaxis/polarchartcategoryaxisangular.cpp \
                 $$PWD/categoryaxis/polarchartcategoryaxisradial.cpp
             PRIVATE_HEADERS += \
                 $$PWD/polarchartaxis_p.h \
                 $$PWD/polarchartaxisangular_p.h \
                 $$PWD/polarchartaxisradial_p.h \
                 $$PWD/valueaxis/polarchartvalueaxisangular_p.h \
                 $$PWD/valueaxis/polarchartvalueaxisradial_p.h \
                 $$PWD/logvalueaxis/polarchartlogvalueaxisangular_p.h \
                 $$PWD/logvalueaxis/polarchartlogvalueaxisradial_p.h \
                 $$PWD/categoryaxis/polarchartcategoryaxisangular_p.h \
                 $$PWD/categoryaxis/polarchartcategoryaxisradial_p.h
             !contains(QT_COORD_TYPE, float): {
             INCLUDEPATH += \
                 $$PWD/datetimeaxis
-            DEPENDPATH += \
-                $$PWD/datetimeaxis
             SOURCES += \
                 $$PWD/datetimeaxis/chartdatetimeaxisx.cpp \
                 $$PWD/datetimeaxis/chartdatetimeaxisy.cpp \
                 $$PWD/datetimeaxis/qdatetimeaxis.cpp \
                 $$PWD/datetimeaxis/polarchartdatetimeaxisangular.cpp \
                 $$PWD/datetimeaxis/polarchartdatetimeaxisradial.cpp
             PRIVATE_HEADERS += \
                 $$PWD/datetimeaxis/chartdatetimeaxisx_p.h \
                 $$PWD/datetimeaxis/chartdatetimeaxisy_p.h \
                 $$PWD/datetimeaxis/qdatetimeaxis_p.h \
                 $$PWD/datetimeaxis/polarchartdatetimeaxisangular_p.h \
                 $$PWD/datetimeaxis/polarchartdatetimeaxisradial_p.h
             PUBLIC_HEADERS += \
                 $$PWD/datetimeaxis/qdatetimeaxis.h
             }

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

             #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well.
             INCLUDEPATH += $$PWD \
                 $$PWD/vertical/bar \
                 $$PWD/vertical/stacked \
                 $$PWD/vertical/percent \
                 $$PWD/horizontal/bar \
                 $$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 \
                 $$PWD/qabstractbarseries.cpp \
                 $$PWD/qbarset.cpp \
                 $$PWD/qbarmodelmapper.cpp \
                 $$PWD/qvbarmodelmapper.cpp \
                 $$PWD/qhbarmodelmapper.cpp \
                 $$PWD/vertical/bar/qbarseries.cpp \
                 $$PWD/vertical/bar/barchartitem.cpp \
                 $$PWD/vertical/stacked/qstackedbarseries.cpp \
                 $$PWD/vertical/stacked/stackedbarchartitem.cpp \
                 $$PWD/vertical/percent/qpercentbarseries.cpp \
                 $$PWD/vertical/percent/percentbarchartitem.cpp \
                 $$PWD/horizontal/bar/qhorizontalbarseries.cpp \
                 $$PWD/horizontal/bar/horizontalbarchartitem.cpp \
                 $$PWD/horizontal/stacked/qhorizontalstackedbarseries.cpp \
                 $$PWD/horizontal/stacked/horizontalstackedbarchartitem.cpp \
                 $$PWD/horizontal/percent/qhorizontalpercentbarseries.cpp \
                 $$PWD/horizontal/percent/horizontalpercentbarchartitem.cpp
             PRIVATE_HEADERS += \
                 $$PWD/bar_p.h \
                 $$PWD/qbarset_p.h \
                 $$PWD/abstractbarchartitem_p.h \
                 $$PWD/qabstractbarseries_p.h \
                 $$PWD/qbarmodelmapper_p.h \
                 $$PWD/vertical/bar/qbarseries_p.h \
                 $$PWD/vertical/bar/barchartitem_p.h \
                 $$PWD/vertical/stacked/qstackedbarseries_p.h \
                 $$PWD/vertical/stacked/stackedbarchartitem_p.h \
                 $$PWD/vertical/percent/qpercentbarseries_p.h \
                 $$PWD/vertical/percent/percentbarchartitem_p.h \
                 $$PWD/horizontal/bar/qhorizontalbarseries_p.h \
                 $$PWD/horizontal/bar/horizontalbarchartitem_p.h \
                 $$PWD/horizontal/stacked/qhorizontalstackedbarseries_p.h \
                 $$PWD/horizontal/stacked/horizontalstackedbarchartitem_p.h \
                 $$PWD/horizontal/percent/qhorizontalpercentbarseries_p.h \
                 $$PWD/horizontal/percent/horizontalpercentbarchartitem_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qabstractbarseries.h \
                 $$PWD/qbarset.h \
                 $$PWD/qbarmodelmapper.h \
                 $$PWD/qvbarmodelmapper.h \
                 $$PWD/qhbarmodelmapper.h \
                 $$PWD/vertical/bar/qbarseries.h \
                 $$PWD/vertical/stacked/qstackedbarseries.h \
                 $$PWD/vertical/percent/qpercentbarseries.h \
                 $$PWD/horizontal/bar/qhorizontalbarseries.h \
                 $$PWD/horizontal/stacked/qhorizontalstackedbarseries.h \
                 $$PWD/horizontal/percent/qhorizontalpercentbarseries.h

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

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/boxplotchartitem.cpp \
                 $$PWD/qboxplotseries.cpp \
                 $$PWD/boxwhiskers.cpp \
                 $$PWD/qboxset.cpp \
                 $$PWD/qboxplotmodelmapper.cpp \
                 $$PWD/qvboxplotmodelmapper.cpp
             PRIVATE_HEADERS += \
                 $$PWD/boxplotchartitem_p.h \
                 $$PWD/qboxplotseries_p.h \
                 $$PWD/boxwhiskers_p.h \
                 $$PWD/boxwhiskersdata_p.h \
                 $$PWD/qboxset_p.h \
                 $$PWD/qboxplotmodelmapper_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qboxplotseries.h \
                 $$PWD/qboxset.h \
                 $$PWD/qboxplotmodelmapper.h \
                 $$PWD/qvboxplotmodelmapper.h

src/charts/charts.pro +2 -10

             ############################# BUILD CONFIG ######################################
             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."
             ############################# SOURCES ##########################################
             SOURCES += \
                 $$PWD/chartdataset.cpp \
                 $$PWD/chartpresenter.cpp \
                 $$PWD/chartthememanager.cpp \
                 $$PWD/qchart.cpp \
                 $$PWD/qchartview.cpp \
                 $$PWD/qabstractseries.cpp \
                 $$PWD/chartbackground.cpp \
                 $$PWD/chartelement.cpp \
                 $$PWD/chartitem.cpp \
                 $$PWD/scroller.cpp \
                 $$PWD/charttitle.cpp \
                 $$PWD/qpolarchart.cpp
             contains(QT_CONFIG, opengl): SOURCES += $$PWD/glwidget.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartdataset_p.h \
                 $$PWD/chartitem_p.h \
                 $$PWD/chartpresenter_p.h \
                 $$PWD/chartthememanager_p.h \
                 $$PWD/chartbackground_p.h \
                 $$PWD/chartelement_p.h \
                 $$PWD/chartconfig_p.h \
                 $$PWD/qchart_p.h \
                 $$PWD/qchartview_p.h \
                 $$PWD/scroller_p.h \
                 $$PWD/qabstractseries_p.h \
                 $$PWD/charttitle_p.h \
                 $$PWD/charthelpers_p.h
             contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.h \
                 $$PWD/qabstractseries.h \
                 $$PWD/qchartview.h \
                 $$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)
             include($$PWD/domain/domain.pri)
             include($$PWD/barchart/barchart.pri)
             include($$PWD/legend/legend.pri)
             include($$PWD/linechart/linechart.pri)
             include($$PWD/piechart/piechart.pri)
             include($$PWD/scatterchart/scatter.pri)
             include($$PWD/splinechart/splinechart.pri)
             include($$PWD/themes/themes.pri)
             include($$PWD/xychart/xychart.pri)
             include($$PWD/layout/layout.pri)
             include($$PWD/boxplotchart/boxplotchart.pri)
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             OTHER_FILES += doc/qtcharts.qdocconf \
                            doc/src/* \
                            doc/images/*
             msvc {
                 # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit
                 # builds resulting from usage of str::sort
                 QMAKE_CXXFLAGS_WARN_ON += -wd4267
             }
             win32:!winrt:!wince {
                 # 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 \
                 $$PWD/polardomain.cpp \
                 $$PWD/xydomain.cpp \
                 $$PWD/xypolardomain.cpp \
                 $$PWD/xlogydomain.cpp \
                 $$PWD/xlogypolardomain.cpp \
                 $$PWD/logxydomain.cpp \
                 $$PWD/logxypolardomain.cpp \
                 $$PWD/logxlogydomain.cpp \
                 $$PWD/logxlogypolardomain.cpp
             PRIVATE_HEADERS += \
                 $$PWD/abstractdomain_p.h \
                 $$PWD/polardomain_p.h \
                 $$PWD/xydomain_p.h \
                 $$PWD/xypolardomain_p.h \
                 $$PWD/xlogydomain_p.h \
                 $$PWD/xlogypolardomain_p.h \
                 $$PWD/logxydomain_p.h \
                 $$PWD/logxypolardomain_p.h \
                 $$PWD/logxlogydomain_p.h \
                 $$PWD/logxlogypolardomain_p.h

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

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/abstractchartlayout.cpp \
                 $$PWD/cartesianchartlayout.cpp \
                 $$PWD/polarchartlayout.cpp
             PRIVATE_HEADERS += \
                 $$PWD/abstractchartlayout_p.h \
                 $$PWD/cartesianchartlayout_p.h \
                 $$PWD/polarchartlayout_p.h

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

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qlegend.cpp \
                 $$PWD/legendlayout.cpp \
                 $$PWD/qlegendmarker.cpp \
                 $$PWD/qpielegendmarker.cpp \
                 $$PWD/legendmarkeritem.cpp \
                 $$PWD/qbarlegendmarker.cpp \
                 $$PWD/qxylegendmarker.cpp \
                 $$PWD/qarealegendmarker.cpp \
                 $$PWD/legendscroller.cpp \
                 $$PWD/qboxplotlegendmarker.cpp
             PRIVATE_HEADERS += \
                 $$PWD/legendscroller_p.h \
                 $$PWD/qlegend_p.h  \
                 $$PWD/legendlayout_p.h \
                 $$PWD/qlegendmarker_p.h \
                 $$PWD/legendmarkeritem_p.h \
                 $$PWD/qpielegendmarker_p.h \
                 $$PWD/qbarlegendmarker_p.h \
                 $$PWD/qxylegendmarker_p.h \
                 $$PWD/qarealegendmarker_p.h \
                 $$PWD/qboxplotlegendmarker_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qlegend.h \
                 $$PWD/qlegendmarker.h \
                 $$PWD/qpielegendmarker.h \
                 $$PWD/qbarlegendmarker.h \
                 $$PWD/qxylegendmarker.h \
                 $$PWD/qarealegendmarker.h \
                 $$PWD/qboxplotlegendmarker.h

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

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/linechartitem.cpp \
                 $$PWD/qlineseries.cpp
             PRIVATE_HEADERS += \
                 $$PWD/linechartitem_p.h \
                 $$PWD/qlineseries_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qlineseries.h

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

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qpieseries.cpp \
                 $$PWD/piesliceitem.cpp \
                 $$PWD/piechartitem.cpp \
                 $$PWD/qpieslice.cpp \
                 $$PWD/qpiemodelmapper.cpp \
                 $$PWD/qvpiemodelmapper.cpp \
                 $$PWD/qhpiemodelmapper.cpp
             PRIVATE_HEADERS += \
                 $$PWD/pieslicedata_p.h \
                 $$PWD/piechartitem_p.h \
                 $$PWD/piesliceitem_p.h \
                 $$PWD/qpieslice_p.h \
                 $$PWD/qpieseries_p.h \
                 $$PWD/qpiemodelmapper_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qpieseries.h \
                 $$PWD/qpieslice.h \
                 $$PWD/qpiemodelmapper.h \
                 $$PWD/qvpiemodelmapper.h \
                 $$PWD/qhpiemodelmapper.h

src/charts/qchartglobal.h +5 -6

             /****************************************************************************
             **
             ** Copyright (C) 2016 The Qt Company Ltd.
             ** Contact: https://www.qt.io/licensing/
             **
             ** This file is part of the Qt Charts module of the Qt Toolkit.
             **
             ** $QT_BEGIN_LICENSE:GPL$
             ** Commercial License Usage
             ** Licensees holding valid commercial Qt licenses may use this file in
             ** accordance with the commercial license agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and The Qt Company. For licensing terms
             ** and conditions see https://www.qt.io/terms-conditions. For further
             ** information use the contact form at https://www.qt.io/contact-us.
             **
             ** GNU General Public License Usage
             ** Alternatively, this file may be used under the terms of the GNU
             ** General Public License version 3 or (at your option) any later version
             ** approved by the KDE Free Qt Foundation. The licenses are as published by
             ** the Free Software Foundation and appearing in the file LICENSE.GPL3
             ** included in the packaging of this file. Please review the following
             ** information to ensure the GNU General Public License requirements will
             ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QCHARTGLOBAL_H
             #define QCHARTGLOBAL_H
             #include <QtCore/QtGlobal>
             #define QT_CHARTS_VERSION_STR QT_VERSION_STR
             /*
                QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
             */
             #define QT_CHARTS_VERSION QT_VERSION
             /*
                can be used like #if (QT_CHARTS_VERSION >= QT_CHARTS_VERSION_CHECK(1, 1, 0))
             */
             #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
-            #if defined(QT_CHARTS_LIBRARY)
+            #ifndef QT_STATIC
+            #  if defined(QT_BUILD_CHARTS_LIB)
             #    define QT_CHARTS_EXPORT Q_DECL_EXPORT
             #  else
             #    define QT_CHARTS_EXPORT Q_DECL_IMPORT
             #  endif
+            #else
-            #ifdef QT_CHARTS_STATICLIB
-            #  undef QT_CHARTS_EXPORT
-            #  undef Q_AUTOTEST_EXPORT
             #  define QT_CHARTS_EXPORT
-            #  define Q_AUTOTEST_EXPORT
             #endif
+            #define QT_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT
             #define QT_CHARTS_NAMESPACE QtCharts
             #ifdef QT_CHARTS_NAMESPACE
             #  define QT_CHARTS_BEGIN_NAMESPACE namespace QT_CHARTS_NAMESPACE {
             #  define QT_CHARTS_END_NAMESPACE }
             #  define QT_CHARTS_USE_NAMESPACE using namespace QT_CHARTS_NAMESPACE;
             #else
             #  define QT_CHARTS_BEGIN_NAMESPACE
             #  define QT_CHARTS_END_NAMESPACE
             #  define QT_CHARTS_USE_NAMESPACE
             #endif
             /*
                 On Windows min and max conflict with standard macros
             */
             #ifdef Q_OS_WIN
             #ifndef NOMINMAX
             #define NOMINMAX
             #endif
             #endif
             #endif // QCHARTGLOBAL_H

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

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qscatterseries.cpp \
                 $$PWD/scatterchartitem.cpp
             PRIVATE_HEADERS += \
                 $$PWD/scatterchartitem_p.h \
                 $$PWD/qscatterseries_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qscatterseries.h

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

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qsplineseries.cpp \
                 $$PWD/splinechartitem.cpp
             PRIVATE_HEADERS += \
                 $$PWD/splinechartitem_p.h \
                 $$PWD/qsplineseries_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qsplineseries.h

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

             INCLUDEPATH += $$PWD
-            DEPENDPATH += $$PWD
             THEMES += \
                 $$PWD/charttheme_p.h \
                 $$PWD/chartthemesystem_p.h \
                 $$PWD/chartthemelight_p.h \
                 $$PWD/chartthemebluecerulean_p.h \
                 $$PWD/chartthemedark_p.h \
                 $$PWD/chartthemebrownsand_p.h \
                 $$PWD/chartthemebluencs_p.h \
                 $$PWD/chartthemehighcontrast_p.h \
                 $$PWD/chartthemeblueicy_p.h \
                 $$PWD/chartthemeqt_p.h

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

-            #INCLUDEPATH += $$PWD
+            INCLUDEPATH += $$PWD
-            #DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/xychart.cpp \
                 $$PWD/qxyseries.cpp \
                 $$PWD/qxymodelmapper.cpp \
                 $$PWD/qvxymodelmapper.cpp \
                 $$PWD/qhxymodelmapper.cpp  \
                 $$PWD/glxyseriesdata.cpp
             PRIVATE_HEADERS += \
                 $$PWD/xychart_p.h \
                 $$PWD/qxyseries_p.h \
                 $$PWD/qxymodelmapper_p.h \
                 $$PWD/glxyseriesdata_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qxyseries.h \
                 $$PWD/qxymodelmapper.h \
                 $$PWD/qvxymodelmapper.h \
                 $$PWD/qhxymodelmapper.h

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 \
                 declarativexypoint.cpp \
                 declarativexyseries.cpp \
                 declarativelineseries.cpp \
                 declarativesplineseries.cpp \
                 declarativeareaseries.cpp \
                 declarativescatterseries.cpp \
                 declarativepieseries.cpp \
                 declarativebarseries.cpp \
                 declarativecategoryaxis.cpp \
                 declarativemargins.cpp \
                 declarativeaxes.cpp \
                 declarativepolarchart.cpp \
                 declarativeboxplotseries.cpp \
                 declarativechartnode.cpp \
                 declarativerendernode.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativexypoint.h \
                 declarativexyseries.h \
                 declarativelineseries.h \
                 declarativesplineseries.h \
                 declarativeareaseries.h \
                 declarativescatterseries.h \
                 declarativepieseries.h \
                 declarativebarseries.h \
                 declarativecategoryaxis.h \
                 declarativemargins.h \
                 declarativeaxes.h \
                 declarativepolarchart.h \
                 declarativeboxplotseries.h \
                 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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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