HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/qchartglobal.h

clean up INCLUDEPATH handling...

clean up INCLUDEPATH handling in the c++ module, the .pri files add their directories, so there is no point in a centralized common.pri doing it again. the qml plugin doesn't need to add any paths from the c++ module explicitly, as the QT+=charts-private implies that already. Change-Id: I263dd702e9874e4d6188ca7251a482d0df4e570b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2877:35b800491709


                r2886:4c015da23a8e

Download file

             qchartglobal.h
        
                    79 lines
            
             | 2.2 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / qchartglobal.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /******************************************************************************

      **

      ** 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)

      #  define QT_CHARTS_EXPORT Q_DECL_EXPORT

      #else

      #  define QT_CHARTS_EXPORT Q_DECL_IMPORT

      #endif

      #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIBRARY)

      #  define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT

      #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIBRARY)

      #  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

	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

				/******************************************************************************
				**
				** 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)
				# define QT_CHARTS_EXPORT Q_DECL_EXPORT
				#else
				# define QT_CHARTS_EXPORT Q_DECL_IMPORT
				#endif

				#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIBRARY)
				# define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT
				#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIBRARY)
				# 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