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

Fix Charts build when quick module is not build...

Fix Charts build when quick module is not build The QML side of Charts should not be built when Qt quick module is not present. Change-Id: Id48fe3c50f365ad195c90da6364d27afd97b90e2 Task-number: QTRD-3273 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2714:929d943d1aab


                r2724:c26fb372333d

Download file

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

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      /****************************************************************************

      **

      ** Copyright (C) 2014 Digia Plc

      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

      ** This file is part of the Qt Enterprise Charts Add-on.

      **

      ** $QT_BEGIN_LICENSE$

      ** Licensees holding valid Qt Enterprise licenses may use this file in

      ** accordance with the Qt Enterprise License Agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and Digia.

      **

      ** If you have questions regarding the use of this file, please use

      ** contact form at http://qt.digia.com

      ** $QT_END_LICENSE$

      **

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

      #ifndef QCHARTGLOBAL_H

      #define QCHARTGLOBAL_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCore/QtGlobal>

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      #define QT_CHARTS_VERSION_STR   "2.0.0"

      /*

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

      */

      #define QT_CHARTS_VERSION       0x020000

      /*

         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

Titta Heikkala Qt Charts project file structure change...	r2712	/****************************************************************************
		**
		** Copyright (C) 2014 Digia Plc
		** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
		** This file is part of the Qt Enterprise Charts Add-on.
		**
		** $QT_BEGIN_LICENSE$
		** Licensees holding valid Qt Enterprise licenses may use this file in
		** accordance with the Qt Enterprise License Agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and Digia.
		**
		** If you have questions regarding the use of this file, please use
		** contact form at http://qt.digia.com
		** $QT_END_LICENSE$
		**
		****************************************************************************/

		#ifndef QCHARTGLOBAL_H
		#define QCHARTGLOBAL_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCore/QtGlobal>
Titta Heikkala Qt Charts project file structure change...	r2712
		#define QT_CHARTS_VERSION_STR "2.0.0"
		/*
		QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
		*/
		#define QT_CHARTS_VERSION 0x020000
		/*
		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