HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2550:f50896eb9f2b

Update version numbers to 1.3.0...

Miikka Heikkinen -

r2550:f50896eb9f2b

parent child

Context file:

r2550:f50896eb9f2b

Collapse all files

charts.pro +2 -2

             !include(config.pri) {
                 error('Missing config.pri')
             }
             TEMPLATE = subdirs
             SUBDIRS = src plugins demos examples tests
             development_build: message('Development build')
             CONFIG += ordered
             QMAKE_CXXFLAGS += -g -Wall
             unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
             win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
             # install feature file
             feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
             feature.files = $$PWD/features/qtcommercialchart.prf
             INSTALLS += feature
             # docs
-            CHARTS_VERSION = 1.2.1
+            CHARTS_VERSION = 1.3.0
-            CHARTS_VERSION_TAG = 121
+            CHARTS_VERSION_TAG = 130
             contains(QMAKE_HOST.os, Windows) {
                 QDOC_CONF = $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
                 win32-g++|qnx {
                     VERSION_SETTINGS = \
                         set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&&
                 } else {
                     VERSION_SETTINGS = \
                         set QT_CHARTS_VERSION=$$CHARTS_VERSION $$escape_expand(\\n\\t) \
                         set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG $$escape_expand(\\n\\t)
                 }
             } else {
                 QDOC_CONF = $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
                 VERSION_SETTINGS = \
                     QT_CHARTS_VERSION=$$CHARTS_VERSION QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG
             }
             contains(QT_MAJOR_VERSION, 5) {
                 QDOC_CMD = qdoc
                 HELPGENERATOR_CMD = qhelpgenerator -platform minimal
             } else {
                 QDOC_CMD = qdoc3
                 HELPGENERATOR_CMD = qhelpgenerator
             }
             QHP_FILE = doc/html/qtcommercialcharts.qhp
             QCH_FILE = doc/qch/qtcommercialcharts.qch
             docs.target = docs
             docs.depends = qch_docs FORCE
             qch_docs.target = qch_docs
             qch_docs.commands = $$HELPGENERATOR_CMD $$QHP_FILE -o $$QCH_FILE
             qch_docs.depends = html_docs FORCE
             html_docs.target = html_docs
             html_docs.commands = $$VERSION_SETTINGS $$QDOC_CMD $$QDOC_CONF
             html_docs.depends = FORCE
             QMAKE_EXTRA_TARGETS += docs qch_docs html_docs
             # coverage
             unix:coverage:{
                 QMAKE_DISTCLEAN += -r ./coverage
                 QMAKE_CLEAN += build/*.gcda build/*.gcno
                 QMAKE_EXTRA_TARGETS +=  buildcoverage runcoverage gencoverage
                 buildcoverage.target = build_coverage
                 buildcoverage.depends = all
                 buildcoverage.commands = mkdir -p ./coverage; \
                                          make -C src prepare_coverage;
                 runcoverage.target = run_coverage
                 runcoverage.depends = buildcoverage
                 runcoverage.commands = for f in `ls ./bin/tst_*` ; do echo "processing \$\$f test..."; \$\$f >> unit.log; done ; exit 0;
                 gencoverage.target = gen_coverage
                 gencoverage.depends = runcoverage
                 gencoverage.commands =  make -C src gen_coverage; \
                                         genhtml  -o ./coverage ./coverage/coverage.info --prefix $$PWD
             }

src/qchartglobal.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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
             #include <qglobal.h>
-            #define QTCOMMERCIALCHART_VERSION_STR   "1.2.1"
+            #define QTCOMMERCIALCHART_VERSION_STR   "1.3.0"
             /*
                QTCOMMERCIALCHART_VERSION is (major << 16) + (minor << 8) + patch.
             */
-            #define QTCOMMERCIALCHART_VERSION       0x010201
+            #define QTCOMMERCIALCHART_VERSION       0x010300
             /*
                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))
             #if defined(QTCOMMERCIALCHART_LIBRARY)
             #  define QTCOMMERCIALCHART_EXPORT Q_DECL_EXPORT
             #else
             #  define QTCOMMERCIALCHART_EXPORT Q_DECL_IMPORT
             #endif
             #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTCOMMERCIALCHART_LIBRARY)
             #  define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_EXPORT
             #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTCOMMERCIALCHART_LIBRARY)
             #  define QTCOMMERCIALCHART_AUTOTEST_EXPORT Q_DECL_IMPORT
             #else
             #  define QTCOMMERCIALCHART_AUTOTEST_EXPORT
             #endif
             #ifdef QTCOMMERCIALCHART_STATICLIB
             #  undef QTCOMMERCIALCHART_EXPORT
             #  undef QTCOMMERCIALCHART_AUTOTEST_EXPORT
             #  define QTCOMMERCIALCHART_EXPORT
             #  define QTCOMMERCIALCHART_AUTOTEST_EXPORT
             #endif
             #define QTCOMMERCIALCHART_NAMESPACE QtCommercialChart
             #ifdef QTCOMMERCIALCHART_NAMESPACE
             #  define QTCOMMERCIALCHART_BEGIN_NAMESPACE namespace QTCOMMERCIALCHART_NAMESPACE {
             #  define QTCOMMERCIALCHART_END_NAMESPACE }
             #  define QTCOMMERCIALCHART_USE_NAMESPACE using namespace QTCOMMERCIALCHART_NAMESPACE;
             #else
             #  define QTCOMMERCIALCHART_BEGIN_NAMESPACE
             #  define QTCOMMERCIALCHART_END_NAMESPACE
             #  define QTCOMMERCIALCHART_USE_NAMESPACE
             #endif
             #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG)
             #include <stdarg.h>
             #include <QDebug>
             #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__)
             static inline QDebug chartDebug(int numargs,...)
             {
                 va_list valist;
                 va_start(valist, numargs);
                 //for( int i = 0 ; i < numargs; i++ )
                 int line = va_arg(valist, int);
                 char *file = va_arg(valist, char *);
                 char *function = va_arg(valist, char *);
                 va_end(valist);
                 return qDebug() << QString().append(function).append("(").append(file).append(":%1)").arg(line);
             }
             #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