HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2891:17cb2cde9c6a

use standardized module export macros...

Oswald Buddenhagen -

r2891:17cb2cde9c6a

parent child

Context file:

r2891:17cb2cde9c6a

Collapse all files

src/charts/charts.pro 0 -3

             ############################# BUILD CONFIG ######################################
             TARGET = QtCharts
             QT = core gui widgets
-            DEFINES += QT_CHARTS_LIBRARY
-            # Fix exports in static builds for applications linking charts module
-            static: MODULE_DEFINES += QT_CHARTS_STATICLIB
             QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf
             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/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/*
             #Define for unit tests
             CONFIG(debug, debug|release) {
                 DEFINES += BUILD_PRIVATE_UNIT_TESTS
             }
             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/qchartglobal.h +9 -11

             /******************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd.
             ** Contact: http://www.qt.io/licensing/
             **
             ** This file is part of the Qt Charts module.
             **
             ** $QT_BEGIN_LICENSE:COMM$
             **
             ** 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 http://www.qt.io/terms-conditions. For further
             ** information use the contact form at http://www.qt.io/contact-us.
             **
             ** $QT_END_LICENSE$
             **
             ******************************************************************************/
             #ifndef QCHARTGLOBAL_H
             #define QCHARTGLOBAL_H
             #include <QtCore/QtGlobal>
             #define QT_CHARTS_VERSION_STR   "2.1.1"
             /*
                QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
             */
             #define QT_CHARTS_VERSION       0x020101
             /*
                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
-            #  define QT_CHARTS_EXPORT Q_DECL_EXPORT
+            #  if defined(QT_BUILD_CHARTS_LIB)
+            #    define QT_CHARTS_EXPORT Q_DECL_EXPORT
+            #  else
+            #    define QT_CHARTS_EXPORT Q_DECL_IMPORT
+            #  endif
             #else
-            #  define QT_CHARTS_EXPORT Q_DECL_IMPORT
+            #  define QT_CHARTS_EXPORT
             #endif
-            #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIBRARY)
+            #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_BUILD_CHARTS_LIB)
             #  define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT
-            #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIBRARY)
+            #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_BUILD_CHARTS_LIB)
             #  define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT
             #else
             #  define QT_CHARTS_AUTOTEST_EXPORT
             #endif
-            #ifdef QT_CHARTS_STATICLIB
-            #  undef QT_CHARTS_EXPORT
-            #  undef QT_CHARTS_AUTOTEST_EXPORT
-            #  define QT_CHARTS_EXPORT
-            #  define QT_CHARTS_AUTOTEST_EXPORT
-            #endif
             #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

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