HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2895:e9a2e2a5e9c0

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

Liang Qi -

r2895:e9a2e2a5e9c0

parent child

Context file:

r2895:e9a2e2a5e9c0

Collapse all files

dist/changes-5.7.0 created 644 +10 0

@@ -0,0 +1,10
	1	Qt Charts 5.7.0
	2
	3	New features
	4	------------
	5	- Added support for showing tooltips when the legend text is truncated
	6	- No longer automatically disable QDateTimeAxis on ARM platforms
	7
	8	Fixed issues
	9	------------
	10	- Fixed reversed axis when useOpenGL is true

src/charts/doc/qtcharts.qdocconf +1 -1

             include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
             project = QtCharts
             description = Qt Charts Reference Documentation
             version = $QT_VERSION
             sourcedirs += .. \
                           ../../chartsqml2
             headerdirs += .. \
                           ../../chartsqml2
             exampledirs += ../../../examples/charts \
                            snippets
             imagedirs += images
-            examplesinstallpath = qtcharts/charts
+            examplesinstallpath = charts
             sources.fileextensions  = "*.cpp *.qdoc"
             depends = qtcore qtgui qtwidgets qtqml qtquick qtmultimedia qtdoc
             Cpp.ignoretokens       += QT_CHARTS_EXPORT \
                                       QT_CHARTS_END_NAMESPACE \
                                       QT_CHARTS_BEGIN_NAMESPACE
             qhp.projects                  = QtCharts
             qhp.QtCharts.file             = qtcharts.qhp
             qhp.QtCharts.namespace        = org.qt-project.qtcharts.$QT_VERSION_TAG
             qhp.QtCharts.virtualFolder    = qtcharts
             qhp.QtCharts.indexTitle       = Qt Charts
             qhp.QtCharts.indexRoot        =
             qhp.QtCharts.filterAttributes                  = qtcharts $QT_VERSION qtrefdoc
             qhp.QtCharts.customFilters.Qt.name             = QtCharts $QT_VERSION
             qhp.QtCharts.customFilters.Qt.filterAttributes = qtcharts $QT_VERSION
             qhp.QtCharts.subprojects = gettingstarted classes types examples
             qhp.QtCharts.subprojects.gettingstarted.title      = Getting Started
             qhp.QtCharts.subprojects.gettingstarted.indexTitle = Qt Charts Getting Started
             qhp.QtCharts.subprojects.gettingstarted.selectors  = fake:page
             qhp.QtCharts.subprojects.gettingstarted.sortPages  = true
             qhp.QtCharts.subprojects.classes.title      = C++ Classes
             qhp.QtCharts.subprojects.classes.indexTitle = Qt Charts C++ Classes
             qhp.QtCharts.subprojects.classes.selectors  = class
             qhp.QtCharts.subprojects.classes.sortPages  = true
             qhp.QtCharts.subprojects.types.title      = QML Types
             qhp.QtCharts.subprojects.types.indexTitle = Qt Charts QML Types
             qhp.QtCharts.subprojects.types.selectors  = qmlclass
             qhp.QtCharts.subprojects.types.sortPages  = true
             qhp.QtCharts.subprojects.examples.title      = Examples
             qhp.QtCharts.subprojects.examples.indexTitle = Qt Charts Examples
             qhp.QtCharts.subprojects.examples.selectors  = fake:example
             qhp.QtCharts.subprojects.examples.sortPages  = true
             navigation.landingpage = Qt Charts
             navigation.cppclassespage = Qt Charts C++ Classes
             navigation.qmltypespage = Qt Charts QML Types

src/charts/doc/src/index.qdoc +5 -5

             /****************************************************************************
             **
             ** Copyright (C) 2016 The Qt Company Ltd.
             ** Contact: https://www.qt.io/licensing/
             **
             ** This file is part of the Qt Charts module of the Qt Toolkit.
             **
             ** $QT_BEGIN_LICENSE:GPL$
             ** 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 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.
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             /*!
                 \title Qt Charts
                 \page qtcharts-index.html
                 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. Qt Charts can
                 be used as QWidgets, QGraphicsWidget, or QML types. Users can easily create impressive
                 graphs by selecting one of the charts themes.
                 \section1 Getting Started
                 To import Qt Charts QML types, add the following import statement to your \c .qml file:
                 \snippet doc_src_qmlcharts.cpp 0
                 If you intend to use Qt Charts C++ classes in your application, use the
                 following include and using directives:
                 \snippet doc_src_qtcharts.cpp 0
-                \note If you are only using a few classes from this module, we recommend including only those
+                \note Since Qt Creator 3.0, projects created with Qt Quick Application
-                specific classes instead of the whole module.
+                wizard based on the Qt Quick 2 template uses QGuiApplication by default.
+                All such QGuiApplication instances in the project must be replaced with
+                QApplication as the module depends on Qt's \l{Graphics View Framework}
+                for rendering.
                 To link against the Qt Charts module, add this line to your \c qmake project file:
                 \snippet doc_src_qtcharts.pro 0
-                See the \l{Qt Charts Getting Started}{Getting started} page for further information on
-                how to use Qt Charts in your application.
                 \section1 References
                 \list
                     \li \l{Qt Charts C++ Classes}
                     \li \l{Qt Charts QML Types}
                 \endlist
                 Qt Charts comes with the following examples:
                 \annotatedlist qtcharts_examples
             */

src/charts/doc/src/qtcharts.qdoc 0 -121

             /****************************************************************************
             **
             ** Copyright (C) 2016 The Qt Company Ltd.
             ** Contact: https://www.qt.io/licensing/
             **
             ** This file is part of the Qt Charts module of the Qt Toolkit.
             **
             ** $QT_BEGIN_LICENSE:GPL$
             ** 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 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.
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             /*!
                 \module Qt Charts
                 \title Qt Charts C++ Classes
                 \ingroup modules
                 \brief C++ classes for the Qt Charts API.
                 Charts API is built on top of Qt Graphics View Framework. Charts can be displayed as QGraphicsWidget using the QChart class. However
                 there is also the convenience class QChartView, which is QWidget based. These enable us to quickly use Qt Charts as a normal Qt widget.
                 Each chart type is represented by the QAbstractSeries derived class. To create charts, the users have to use an instance of the related
                 series class and add it to a QChart instance.
                 \code
                 QLineSeries* series = new QLineSeries();
                 series->add(0, 6);
                 series->add(2, 4);
                 ...
                 chartView->chart()->addSeries(series);
                 chartView->chart()->createDefaultAxes();
                 \endcode
             */
             /*!
                 \qmlmodule QtCharts 2.1
                 \title Qt Charts QML Types
                 \ingroup qmlmodules
                 \brief QML types for the Qt Charts API.
                 The Qt Charts QML API is an intuitive and simple way to show charts in your QML
                 applications.
                 Use the following QML to create a simple pie chart:
                 \image examples_qmlpiechart.png
                 \snippet qmlpiechart/qml/qmlpiechart/main.qml 1
                 \snippet qmlpiechart/qml/qmlpiechart/main.qml 2
                 \snippet qmlpiechart/qml/qmlpiechart/main.qml 3
                 \note Since Qt Creator 3.0 the project created with Qt Quick Application wizard based on
                 Qt Quick 2 template uses QGuiApplication by default. As Qt Charts utilizes Qt Graphics View
                 Framework for drawing, QApplication must be used. The project created with the wizard is
                 usable with Qt Charts after the QGuiApplication is replaced with QApplication.
                 \section1 QML Types
             */
             /*!
                 \group charts_examples
                 \ingroup all-examples
                 \title Qt Charts Examples
                 \brief Examples for the Qt Charts.
                 For some code examples, see one of the Qt Charts examples:
                 \section1 Examples
                 \annotatedlist qtcharts_examples
             */
-            /*!
-                \group qtcharts_getting_started
-                \title Qt Charts Getting Started
-                \section1 Installing the Qt Charts module
-                Use the \c {Package Manager} in \c {Maintenance Tool} or the \c {Online installer} to install
-                the Qt Charts module. The module can be found under \c {Qt Enterprise Add-Ons} in the
-                package manager.
-                After installation Qt Charts documentation and examples are available in Qt Creator.
-                Examples can be found on the examples page of Qt Creator by selecting the Qt Charts
-                component from the drop-down menu.
-                The source code is installed into the QtCharts folder under EnterpriseAddOns.
-                \section1 Building Qt Charts
-                To build the Qt Charts module from source code yourself, set up a command prompt with
-                an environment for building Qt applications, navigate to the directory containing
-                \c {qtcharts.pro}, and configure the project with qmake:
-                \code
-                qmake
-                \endcode
-                qmake should be run from the folder where Qt has been installed. For example,
-                if Qt is built with -prefix /opt/MyXCompiledQt, then qmake should be run
-                from /opt/MyXCompiledQt/bin/qmake.
-                After running qmake, build the project with make:
-                \table
-                \header
-                  \li OS                       \li Make command
-                \row
-                  \li Linux                    \li make
-                \row
-                  \li Windows (MinGw)          \li mingw32-make
-                \row
-                  \li Windows (MSVC)           \li nmake
-                \row
-                  \li OSX                      \li make
-                \endtable
-                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:
-                \code
-                qmake CONFIG+=debug
-                make
-                \endcode
-                or
-                \code
-                qmake CONFIG+=debug_and_release
-                make debug
-                \endcode
-                For release builds:
-                \code
-                qmake CONFIG+=release
-                make
-                \endcode
-                or
-                \code
-                qmake CONFIG+=debug_and_release
-                make release
-                \endcode
-                For both builds (Windows/OS X only):
-                \code
-                qmake CONFIG+="debug_and_release build_all"
-                make
-                \endcode
-                After building, install the module to your Qt directory:
-                \code
-                make install
-                \endcode
-                If you want to uninstall the module:
-                \code
-                make uninstall
-                \endcode
-                To build a statically linked version of the Qt Charts module, give the following commands:
-                \snippet doc_src_qtcharts.cpp 1
-                \section1 Running examples
-                Qt Charts examples are found under the \c examples subdirectory. To build and run a single
-                example, in this case qmlpolarchart, navigate to the example directory and enter the following
-                commands:
-                \snippet doc_src_qtcharts.cpp 2
-                \note On some platforms, such as Windows, the executable can be generated under debug or
-                release folders, depending on your build.
-                \section1 Creating a simple application
-                To create a simple application, start by creating a new Qt Gui Application project in Qt
-                Creator and add this line to the \c .pro file of the project:
-                \snippet doc_src_qtcharts.pro 0
-                In the \c main.cpp file, include the module headers and declare namespace usage:
-                \snippet doc_src_qtcharts.cpp 0
-                \note Since Qt Creator 3.0 the project created with Qt Quick Application wizard based on
-                Qt Quick 2 template uses QGuiApplication by default. As Qt Charts utilizes Qt Graphics View
-                Framework for drawing, QApplication must be used. The project created with the wizard is
-                usable with Qt Charts after the QGuiApplication is replaced with QApplication.
-                For further code examples, see one of the Qt Charts examples:
-                \annotatedlist qtcharts_examples
-            */

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