HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2877:35b800491709

Bump version to 2.1.1...

Miikka Heikkinen -

r2877:35b800491709

parent child

Context file:

r2877:35b800491709

Collapse all files

dist/changes-2.1.1 created 644 +8 0

@@ -0,0 +1,8
	1	Qt Charts 2.1.1
	2
	3	Fixed issues
	4	------------
	5	- Fixed crash with empty BarSet values
	6	- Fixed model resetting with model mapper
	7	- Fixed crash when axis range is infinite
	8	- Fixed clearing the chart title

.qmake.conf +1 -1

             load(qt_build_config)
             CONFIG += qt_example_installs
-            MODULE_VERSION=2.1.0
+            MODULE_VERSION=2.1.1

README +1 -1

             ---------------
-            Qt Charts 2.1.0
+            Qt Charts 2.1.1
             ---------------
             Qt Charts module provides a set of easy to use chart components. It uses
             the Qt Graphics View Framework, therefore charts can be easily integrated
             to modern user interfaces.
             System Requirements
             ===================
             - Qt 5.4 or newer
             - For QML applications QtQuick 2 is required
             - Manipulating Qt Charts graphs with QML Designer requires Qt Creator 3.3 or newer
             Building
             ========
             Configure the project with qmake:
                 qmake
             After running qmake, build the project with make:
                 (Linux) make
                 (Windows with MinGw) mingw32-make
                 (Windows with Visual Studio) nmake
                 (OS X) make
             The above generates the default makefiles for your configuration, which is typically
             the release build if you are using precompiled binary Qt distribution. To build both
             debug and release, or one specifically, use one of the following qmake lines instead.
             For debug builds:
                 qmake CONFIG+=debug
                 make
               or
                 qmake CONFIG+=debug_and_release
                 make debug
             For release builds:
                 qmake CONFIG+=release
                 make
               or
                 qmake CONFIG+=debug_and_release
                 make release
             For both builds (Windows/OS X only):
                 qmake CONFIG+="debug_and_release build_all"
                 make
             After building, install the module to your Qt directory:
                 make install
             If you want to uninstall the module:
                 make uninstall
             Building as a statically linked library
             =======================================
             The same as above applies, you will just have to add static to the CONFIG:
                 qmake CONFIG+=static
             Documentation
             =============
             The documentation can be generated with:
                 make docs
             The documentation is generated into the doc folder under the build folder.
             Both Qt Assistant (qtcharts.qch) and in HTML format (qtcharts subfolder)
             documentation is generated.
             Please refer to the generated documentation for more information:
                 doc/qtcharts/index.html
             Known issues
             ============
             - Zooming too far or too close may eventually freeze the zooming and scrolling.

src/charts/qchartglobal.h +2 -2

             /******************************************************************************
             **
             ** 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.0"
+            #define QT_CHARTS_VERSION_STR   "2.1.1"
             /*
                QT_CHARTS_VERSION is (major << 16) + (minor << 8) + patch.
             */
-            #define QT_CHARTS_VERSION       0x020100
+            #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

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