HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2582:8fe6fadece73

Fix various documentation issues...

Miikka Heikkinen -

r2582:8fe6fadece73

parent child

Context file:

r2582:8fe6fadece73

Collapse all files

doc/images/qt-logo.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

charts.pro +2 -2

                 HELPGENERATOR_CMD = qhelpgenerator
             }
-            QHP_FILE = doc/html/qtcommercialcharts.qhp
+            QHP_FILE = doc/html/qtcharts.qhp
-            QCH_FILE = doc/qch/qtcommercialcharts.qch
+            QCH_FILE = doc/qch/qtcharts.qch
             docs.target = docs
             docs.depends = qch_docs FORCE

doc/qchart-html-template.qdocconf +1 -1

                 "</div> \n" \
                 "<div class=\"footer\">\n" \
                 "  <p>\n" \
-                "     <acronym title=\"Copyright\">&copy;</acronym> 2013 Digia ." \
+                "     <acronym title=\"Copyright\">&copy;</acronym> 2013 Digia." \
                 "     Qt and Qt logos are trademarks of of Digia Corporation \n" \
                 "     in Finland and/or other countries worldwide.</p>\n" \
                 "  <p>\n" \

doc/qchart-html.qdocconf +1 -1

             # These also need to be listed in qhp.Qt.extraFiles with the correct
             # directory prefixes.
-            extraimages.HTML        = qt_commercial_logo.png \
+            extraimages.HTML        = qt-logo.png \
                                       digia_logo.png \
                                       qcharts.png \
                                       arrow_down.png \

doc/qchart-qch.qdocconf +22 -22

-            qhp.projects                            = QtCommercialCharts
+            qhp.projects                            = QtCharts
-            qhp.QtCommercialCharts.file             = qtcommercialcharts.qhp
+            qhp.QtCharts.file             = qtcharts.qhp
-            qhp.QtCommercialCharts.namespace        = com.digia.qtcommercialcharts.$QT_CHARTS_VERSION_TAG
+            qhp.QtCharts.namespace        = com.digia.qtcharts.$QT_CHARTS_VERSION_TAG
-            qhp.QtCommercialCharts.virtualFolder    = doc
+            qhp.QtCharts.virtualFolder    = doc
-            qhp.QtCommercialCharts.indexTitle       = QtCommercial Charts Reference $QT_CHARTS_VERSION
+            qhp.QtCharts.indexTitle       = Qt Charts Reference $QT_CHARTS_VERSION
-            qhp.QtCommercialCharts.filterAttributes = qtcommercialcharts $QT_CHARTS_VERSION
+            qhp.QtCharts.filterAttributes = qtcharts $QT_CHARTS_VERSION
-            qhp.QtCommercialCharts.customFilters.QtCommercialCharts.name = QtCommercial Charts $QT_CHARTS_VERSION
+            qhp.QtCharts.customFilters.QtCharts.name = Qt Charts $QT_CHARTS_VERSION
-            qhp.QtCommercialCharts.customFilters.QtCommercialCharts.filterAttributes = qtcommercialcharts $QT_CHARTS_VERSION
+            qhp.QtCharts.customFilters.QtCharts.filterAttributes = qtcharts $QT_CHARTS_VERSION
-            qhp.QtCommercialCharts.indexRoot        =
+            qhp.QtCharts.indexRoot        =
-            qhp.QtCommercialCharts.subprojects = gettingstarted classes qmlclasses examples demos
+            qhp.QtCharts.subprojects = gettingstarted classes qmlclasses examples demos
-            qhp.QtCommercialCharts.subprojects.gettingstarted.title      = Getting Started
+            qhp.QtCharts.subprojects.gettingstarted.title      = Getting Started
-            qhp.QtCommercialCharts.subprojects.gettingstarted.indexTitle = QtCommercial Charts getting started
+            qhp.QtCharts.subprojects.gettingstarted.indexTitle = Qt Charts getting started
-            qhp.QtCommercialCharts.subprojects.classes.title      = API Classes
+            qhp.QtCharts.subprojects.classes.title      = API Classes
-            qhp.QtCommercialCharts.subprojects.classes.indexTitle = QtCommercial Charts API
+            qhp.QtCharts.subprojects.classes.indexTitle = Qt Charts API
-            qhp.QtCommercialCharts.subprojects.qmlclasses.title      = QML API
+            qhp.QtCharts.subprojects.qmlclasses.title      = QML API
-            qhp.QtCommercialCharts.subprojects.qmlclasses.indexTitle = QtCommercial Charts QML API
+            qhp.QtCharts.subprojects.qmlclasses.indexTitle = Qt Charts QML API
-            qhp.QtCommercialCharts.subprojects.examples.title      = Examples
+            qhp.QtCharts.subprojects.examples.title      = Examples
-            qhp.QtCommercialCharts.subprojects.examples.indexTitle = QtCommercial Charts Examples
+            qhp.QtCharts.subprojects.examples.indexTitle = Qt Charts Examples
-            qhp.QtCommercialCharts.subprojects.demos.title      = Demos
+            qhp.QtCharts.subprojects.demos.title      = Demos
-            qhp.QtCommercialCharts.subprojects.demos.indexTitle = QtCommercial Charts Demos
+            qhp.QtCharts.subprojects.demos.indexTitle = Qt Charts Demos
             # Files not referenced in any qdoc file.
             # See also extraimages.HTML
-            qhp.QtCommercialCharts.extraFiles = index.html \
+            qhp.QtCharts.extraFiles = index.html \
                                                 examples.html \
                                                 demos.html \
                                                 images/arrow_down.png \
                                                 images/digia_logo.png \
                                                 images/horBar.png \
                                                 images/qcharts.png \
-                                                images/qt_commercial_logo.png \
+                                                images/qt-logo.png \
                                                 style/offline.css

doc/src/classes.qdoc +2 -2

             /*!
                 \page classes.html
-                \title Qt Enterprise Charts API
+                \title Qt Charts API
                 \keyword All Classes
                 Charts API is build on top of Qt Graphics View Framework. Charts can be displayed as QGraphicsWidget using QChart class. However
-                there is also convenience class QChartView which is QWidget based. These lets quickly use QCharts as normal Qt widget.
+                there is also convenience class QChartView which is QWidget based. These lets quickly use Qt Charts as normal Qt widget.
                 Each chart type is represented by QAbstractSeries derived class. To create given chart type users have to use instance of related series class and add it to QChart instance.
                 \code

doc/src/demos-qmloscilloscope.qdoc +1 -1

                 \image demos_qmloscilloscope.png
-                Oscilloscope application demonstrates how to use Qt Enterprise Charts QML API to implement an
+                Oscilloscope application demonstrates how to use Qt Charts QML API to implement an
                 application with strict performance requirements. The application uses generated data with
                 configurable characteristics to mimic a simple oscilloscope user interface. To find out the
                 actual screen refresh performance of the application, you can set QML_SHOW_FRAMERATE = 1 to

doc/src/demos-quick2chart.qdoc +5 -3

             /*!
                 \example demos/quick2chart
-                \title QtQuick 2 charts demo
+                \title Qt Quick 2 charts demo
                 \subtitle
                 \image demos_qmlchart1.png
-                This is a reimplementation of \l{Qml charts demo} in QtQuick 2.
+                This is a reimplementation of \l{Qml charts demo} in Qt Quick 2.
-                Only difference in qml files is importing the correct version of QtQuick:
+                The main difference in qml files is importing the correct version of Qt Quick:
                 \snippet ../demos/quick2chart/qml/quick2chart/View1.qml 2
+                Additionally, antialiasing is set with qml property in Qt Quick 2.
             */

doc/src/demos-quick2oscilloscope.qdoc +4 -4

             /*!
                 \example demos/quick2oscilloscope
-                \title QtQuick 2 Oscilloscope
+                \title Qt Quick 2 Oscilloscope
                 \image demos_qmloscilloscope.png
-                This is a reimplementation of \l{Oscilloscope} demo in QtQuick 2.
+                This is a reimplementation of \l{Oscilloscope} demo in Qt Quick 2.
-                Only difference in qml files is importing the correct version of QtQuick:
+                The main difference in qml files is importing the correct version of Qt Quick:
                 \snippet ../demos/quick2oscilloscope/qml/quick2oscilloscope/main.qml 3
-                \note QML_SHOW_FRAMERATE environment variable doesn't work with QtQuick 2.
+                \note QML_SHOW_FRAMERATE environment variable doesn't work with Qt Quick 2.
                 Starting with Qt 5.1.0, QSG_RENDER_TIMING environment variable can be used
                 similarly to display rendering time.
             */

doc/src/demos.qdoc +5 -5

             /*!
                 \page demos.html
-                \title Qt Enterprise Charts Demos
+                \title Qt Charts Demos
                 \keyword Demos
                 \raw HTML
                     </tr>
                     <tr>
                         <td><a href="demos-qmlpolarchart.html">Qml Polar Chart</a></td>
-                        <td><a href="demos-quick2chart.html">QtQuick 2 Basic Charts</a></td>
+                        <td><a href="demos-quick2chart.html">Qt Quick 2 Basic Charts</a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-qmlpolarchart.html"><img src="images/demos_qmlpolarchart1.png" width="300" alt="Qml Polar Chart" /></a></td>
-                        <td><a href="demos-quick2chart.html"><img src="images/demos_qmlchart1.png" width="300" alt="QtQuick 2 Basic Charts" /></a></td>
+                        <td><a href="demos-quick2chart.html"><img src="images/demos_qmlchart1.png" width="300" alt="Qt Quick 2 Basic Charts" /></a></td>
                     </tr>
                     <tr>
-                        <td><a href="demos-quick2oscilloscope.html">QtQuick 2 Oscilloscope</a></td>
+                        <td><a href="demos-quick2oscilloscope.html">Qt Quick 2 Oscilloscope</a></td>
                     </tr>
                     <tr>
-                        <td><a href="demos-quick2oscilloscope.html"><img src="images/demos_qmloscilloscope.png" width="300" alt="QtQuick 2 Oscilloscope" /></a></td>
+                        <td><a href="demos-quick2oscilloscope.html"><img src="images/demos_qmloscilloscope.png" width="300" alt="Qt Quick 2 Oscilloscope" /></a></td>
                     </tr>
                 </table>
                 </div>

doc/src/examples.qdoc +1 -1

             /*!
                 \page examples.html
-                \title Qt Enterprise Charts Examples
+                \title Qt Charts Examples
                 \keyword Examples
                 \raw HTML

doc/src/gettingstarted.qdoc +4 -4

             /*!
                 \page gettingstarted.html
-                \title Qt Enterprise Charts getting started
+                \title Qt Charts getting started
                 \keyword Introduction
                 Compiling:
                 Depending on the OS and the compiler you are using "make" might need to be replaced with another command like: nmake, mingw32-make, etc.
-                To uninstall the Qt Enterprise Charts run:
+                To uninstall the Qt Charts run:
                 \code
                 make uninstall
                 \endcode
                 \bold {Widget project}
-                To use the QCharts classes add Qt Enterprise Charts namespace macro in your header file.
+                To use the Qt Charts classes add Qt Charts namespace macro in your header file.
                 \code
                 #include<QWidget>
                 #include<QChartView>
                 Add an import line to your *.qml file:
                 \code
-                import QtCommercial.Chart 1.2
+                import QtCommercial.Chart 1.3
                 \endcode
                 \raw HTML

doc/src/index.qdoc +4 -4

                 \raw HTML
                 <div class="qchart">
-                <img src="images/qt_commercial_logo.png" alt="qt_logo"/>
+                <img src="images/qt-logo.png" alt="qt-logo"/>
                 <p>
-                    QCharts is a part of Qt Enterprise addons package. It provides a set of easy to use chart
+                    Qt Charts is a part of Qt addons package. It provides a set of easy to use chart
-                    components which are available for Qt Enterprise customers. It uses Qt Graphics View
+                    components which are available for Qt customers. It uses Qt Graphics View
-                    Framework, therefore charts can be easily integrated to modern user interfaces. QCharts can
+                    Framework, therefore charts can be easily integrated to modern user interfaces. Qt Charts can
                     be used as QWidgets, QGraphicsWidget or QML elements. Users can easily create impressive
                     graphs by selecting one of the charts themes.
                 </p>

doc/src/qml.qdoc +8 -8

             /*!
                 \page qml.html
-                \title Qt Enterprise Charts QML API
+                \title Qt Charts QML API
                 \keyword Charts QML API
-                Qt Enterprise Charts QML API is an intuitive and simple way to show charts in your QML
+                Qt Charts QML API is an intuitive and simple way to show charts in your QML
                 applications.
                 \table
                         \o \inlineimage examples_qmlpiechart.png
                 \endtable
-                \note Since Qt Enterprise Charts utilizes Qt Graphics View Framework for drawing, it works best
+                \note Since Qt Charts utilizes Qt Graphics View Framework for drawing, it works best
-                with QtQuick 1, which is based on the same framework.
+                with Qt Quick 1, which is based on the same framework.
-                As of release 1.3.0, Qt Enterprise Charts is also usable with QtQuick 2, though the performance
+                As of release 1.3.0, Qt Charts is also usable with Qt Quick 2, though the performance
-                is slightly worse than with QtQuick 1 due to additional rendering step that is required.
+                is slightly worse than with Qt Quick 1 due to additional rendering step that is required.
-                \note QtQuick 1 is supported from Qt 4.7.4 onwards because of missing
+                \note Qt Quick 1 is supported from Qt 4.7.4 onwards because of missing
-                Q_REVISION macro in the earlier Qt releases. QtQuick 2 is supported with only Qt 5.
+                Q_REVISION macro in the earlier Qt releases. Qt Quick 2 is supported with only Qt 5.
                 \raw HTML
                     <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">

plugins/declarative/declarativepolarchart.cpp 0 -2

                 any line connecting the two points becomes meaningless, so choose the axis ranges accordingly
                 when displaying line, spline, or area series.
-                \note Polar charts do not support multiple axes of same orientation.
                 The following QML shows how to create a polar chart with two series:
                 \snippet ../demos/qmlpolarchart/qml/qmlpolarchart/View1.qml 1

plugins/designer/qchartsplugin.cpp +2 -2

             QString QChartsPlugin::group() const
             {
-                return tr("QCharts Widgets");
+                return tr("Qt Charts Widgets");
             }
             QIcon QChartsPlugin::icon() const
             QString QChartsPlugin::toolTip() const
             {
-                return tr("An qcharts view widget");
+                return tr("An Qt Charts view widget");
             }
             QString QChartsPlugin::whatsThis() const

doc/images/qt_commercial_logo.png removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

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