##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Remove warnings about unmatched parentheses...
Remove warnings about unmatched parentheses Property declarations divided into several lines caused qmake to warn of cat() function about deprecated unmatched parentheses. The property declarations are now done in one line. Task-number: QTRD-3159 Change-Id: Ieb839ff81d707a5a40cdebd62a52ac32f51517b7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Titta Heikkala - - Load All Authors

File last commit:

r2688:bdd8266c9c7d
r2692:d672b074a893
Show More
qchartglobal.h
97 lines | 3.0 KiB | text/x-c | CLexer
/ src / qchartglobal.h
History | Source | Raw |Copy content |Copy permalink
Jani Honkonen
Add license headers
 r794 /****************************************************************************
**
Titta Heikkala
Update copyright year...
 r2688 ** Copyright (C) 2014 Digia Plc
Jani Honkonen
Add license headers
 r794 ** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** This file is part of the Qt Enterprise Charts Add-on.
Jani Honkonen
Add license headers
 r794 **
** $QT_BEGIN_LICENSE$
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** Licensees holding valid Qt Enterprise licenses may use this file in
** accordance with the Qt Enterprise License Agreement provided with the
Jani Honkonen
Add license headers
 r794 ** 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$
**
****************************************************************************/
Jani Honkonen
Spit&polish public headers
 r2046 #ifndef QCHARTGLOBAL_H
#define QCHARTGLOBAL_H
Tero Ahola
Renamed to QtCommercialChart
 r30
Jani Honkonen
Update version to qchartglobal.h
 r2070 #include <qglobal.h>
Kimmo Leppälä
Update Charts defined version number to 1.3.1...
 r2668 #define QTCOMMERCIALCHART_VERSION_STR "1.3.1"
Jani Honkonen
Update version to qchartglobal.h
 r2070 /*
QTCOMMERCIALCHART_VERSION is (major << 16) + (minor << 8) + patch.
*/
Kimmo Leppälä
Update Charts defined version number to 1.3.1...
 r2668 #define QTCOMMERCIALCHART_VERSION 0x010301
Jani Honkonen
Update version to qchartglobal.h
 r2070 /*
can be used like #if (QTCOMMERCIALCHART_VERSION >= QTCOMMERCIALCHART_VERSION_CHECK(1, 1, 0))
*/
#define QTCOMMERCIALCHART_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
Tero Ahola
Renamed to QtCommercialChart
 r30
#if defined(QTCOMMERCIALCHART_LIBRARY)
# define QTCOMMERCIALCHART_EXPORT Q_DECL_EXPORT
#else
# define QTCOMMERCIALCHART_EXPORT Q_DECL_IMPORT
#endif
Michal Klocek
Adds visibility hidden compilation flag, adds EXPORT_AUTO macro for interal unit testing
 r1050
#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTCOMMERCIALCHART_LIBRARY)
Jani Honkonen
Adding support for static builds.
 r1440 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_EXPORT
Michal Klocek
Adds visibility hidden compilation flag, adds EXPORT_AUTO macro for interal unit testing
 r1050 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTCOMMERCIALCHART_LIBRARY)
Jani Honkonen
Adding support for static builds.
 r1440 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_IMPORT
Michal Klocek
Adds visibility hidden compilation flag, adds EXPORT_AUTO macro for interal unit testing
 r1050 #else
Jani Honkonen
Adding support for static builds.
 r1440 # define QTCOMMERCIALCHART_AUTOTEST_EXPORT
#endif
#ifdef QTCOMMERCIALCHART_STATICLIB
# undef QTCOMMERCIALCHART_EXPORT
# undef QTCOMMERCIALCHART_AUTOTEST_EXPORT
# define QTCOMMERCIALCHART_EXPORT
# define QTCOMMERCIALCHART_AUTOTEST_EXPORT
Michal Klocek
Adds visibility hidden compilation flag, adds EXPORT_AUTO macro for interal unit testing
 r1050 #endif
Tero Ahola
Renamed to QtCommercialChart
 r30
#define QTCOMMERCIALCHART_NAMESPACE QtCommercialChart
#ifdef QTCOMMERCIALCHART_NAMESPACE
Jani Honkonen
Adding support for static builds.
 r1440 # define QTCOMMERCIALCHART_BEGIN_NAMESPACE namespace QTCOMMERCIALCHART_NAMESPACE {
# define QTCOMMERCIALCHART_END_NAMESPACE }
# define QTCOMMERCIALCHART_USE_NAMESPACE using namespace QTCOMMERCIALCHART_NAMESPACE;
Tero Ahola
Renamed to QtCommercialChart
 r30 #else
Jani Honkonen
Adding support for static builds.
 r1440 # define QTCOMMERCIALCHART_BEGIN_NAMESPACE
# define QTCOMMERCIALCHART_END_NAMESPACE
# define QTCOMMERCIALCHART_USE_NAMESPACE
Tero Ahola
Renamed to QtCommercialChart
 r30 #endif
Michal Klocek
Updates development_build option
 r998 #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG)
Michal Klocek
Refactors qchart , adds line animation...
 r131 #include <stdarg.h>
#include <QDebug>
Jani Honkonen
Adding support for static builds.
 r1440 #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__)
Michal Klocek
Improves build configuration...
 r996 static inline QDebug chartDebug(int numargs,...)
Michal Klocek
Refactors qchart , adds line animation...
 r131 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 va_list valist;
va_start(valist, numargs);
//for( int i = 0 ; i < numargs; i++ )
int line = va_arg(valist, int);
Jani Honkonen
more coding style fixes for src-folder...
 r2104 char *file = va_arg(valist, char *);
char *function = va_arg(valist, char *);
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 va_end(valist);
return qDebug() << QString().append(function).append("(").append(file).append(":%1)").arg(line);
Michal Klocek
Refactors qchart , adds line animation...
 r131 }
Michal Klocek
Improves build configuration...
 r996 #endif
Jani Honkonen
Adding support for static builds.
 r1440
Titta Heikkala
Fix compiler errors when including Windows.h...
 r2616 /*
On Windows min and max conflict with standard macros
*/
#ifdef Q_OS_WIN
Titta Heikkala
Fix NOMINMAX definition...
 r2661 #ifndef NOMINMAX
Titta Heikkala
Fix compiler errors when including Windows.h...
 r2616 #define NOMINMAX
#endif
Titta Heikkala
Fix NOMINMAX definition...
 r2661 #endif
Titta Heikkala
Fix compiler errors when including Windows.h...
 r2616
Jani Honkonen
Spit&polish public headers
 r2046 #endif // QCHARTGLOBAL_H