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

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

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

Liang Qi - - Load All Authors

File last commit:

r2898:03a6177a3223 master


                r2898:03a6177a3223

master

Download file

             qchartglobal.h
        
                    78 lines
            
             | 2.4 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / qchartglobal.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

              r2854
            
      /****************************************************************************

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** Copyright (C) 2016 The Qt Company Ltd.

      ** Contact: https://www.qt.io/licensing/

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** This file is part of the Qt Charts module of the Qt Toolkit.

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** $QT_BEGIN_LICENSE:GPL$

        Titta Heikkala
    
Updated license headers...

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

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** 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.

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ****************************************************************************/

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      #ifndef QCHARTGLOBAL_H

      #define QCHARTGLOBAL_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCore/QtGlobal>

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
        Miikka Heikkinen
    
Fix version numbers...

              r2858
            
      #define QT_CHARTS_VERSION_STR QT_VERSION_STR

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      /*

         QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.

      */

        Miikka Heikkinen
    
Fix version numbers...

              r2858
            
      #define QT_CHARTS_VERSION QT_VERSION

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      /*

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

        Oswald Buddenhagen
    
use standardized module export macros...

              r2891
            
      #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

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      #else

      #  define QT_CHARTS_EXPORT

      #endif

        Oswald Buddenhagen
    
use standardized test export macros...

              r2892
            
      #define QT_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      #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

Miikka Heikkinen Updated license...	r2854	/****************************************************************************
Titta Heikkala Qt Charts project file structure change...	r2712	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Titta Heikkala Qt Charts project file structure change...	r2712	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Titta Heikkala Qt Charts project file structure change...	r2712	**
Miikka Heikkinen Updated license...	r2854	** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala Updated license headers...	r2845	** 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
Miikka Heikkinen Updated license...	r2854	** 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.
Titta Heikkala Qt Charts project file structure change...	r2712	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Titta Heikkala Qt Charts project file structure change...	r2712
		#ifndef QCHARTGLOBAL_H
		#define QCHARTGLOBAL_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCore/QtGlobal>
Titta Heikkala Qt Charts project file structure change...	r2712
Miikka Heikkinen Fix version numbers...	r2858	#define QT_CHARTS_VERSION_STR QT_VERSION_STR
Titta Heikkala Qt Charts project file structure change...	r2712	/*
		QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
		*/
Miikka Heikkinen Fix version numbers...	r2858	#define QT_CHARTS_VERSION QT_VERSION
Titta Heikkala Qt Charts project file structure change...	r2712	/*
		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))

Oswald Buddenhagen use standardized module export macros...	r2891	#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
Titta Heikkala Qt Charts project file structure change...	r2712	#else
		# define QT_CHARTS_EXPORT
		#endif

Oswald Buddenhagen use standardized test export macros...	r2892	#define QT_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT
Titta Heikkala Qt Charts project file structure change...	r2712
		#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