From e9a2e2a5e9c023c872e39e39fb2a8b0a31820577 2016-05-24 17:59:54 From: Liang Qi Date: 2016-05-24 17:59:54 Subject: [PATCH] Merge remote-tracking branch 'origin/5.7' into dev Change-Id: I86dec1064d79704214e885681449ca347b193d66 --- diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0 new file mode 100644 index 0000000..48e53f6 --- /dev/null +++ b/dist/changes-5.7.0 @@ -0,0 +1,10 @@ +Qt Charts 5.7.0 + +New features +------------ +- Added support for showing tooltips when the legend text is truncated +- No longer automatically disable QDateTimeAxis on ARM platforms + +Fixed issues +------------ +- Fixed reversed axis when useOpenGL is true diff --git a/src/charts/doc/qtcharts.qdocconf b/src/charts/doc/qtcharts.qdocconf index 817a9b8..33f569f 100644 --- a/src/charts/doc/qtcharts.qdocconf +++ b/src/charts/doc/qtcharts.qdocconf @@ -12,7 +12,7 @@ exampledirs += ../../../examples/charts \ snippets imagedirs += images -examplesinstallpath = qtcharts/charts +examplesinstallpath = charts sources.fileextensions = "*.cpp *.qdoc" diff --git a/src/charts/doc/src/index.qdoc b/src/charts/doc/src/index.qdoc index d464cd0..21874b5 100644 --- a/src/charts/doc/src/index.qdoc +++ b/src/charts/doc/src/index.qdoc @@ -47,16 +47,16 @@ \snippet doc_src_qtcharts.cpp 0 - \note If you are only using a few classes from this module, we recommend including only those - specific classes instead of the whole module. + \note Since Qt Creator 3.0, projects created with Qt Quick Application + 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} diff --git a/src/charts/doc/src/qtcharts.qdoc b/src/charts/doc/src/qtcharts.qdoc index a0c0cf5..e83e263 100644 --- a/src/charts/doc/src/qtcharts.qdoc +++ b/src/charts/doc/src/qtcharts.qdoc @@ -86,124 +86,3 @@ \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 -*/