diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:06:00 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:06:30 +0100 |
| commit | 36a42ed6b11dce102d0e0f93fbd441011b003157 (patch) | |
| tree | fee762b914cdd525601e5bde150da82a159d86e8 /src/qml | |
| parent | 9e11754fdceae18b49bf1b0947e48b5f81e85d59 (diff) | |
| parent | fc0e916784b88a3a9ad12263ecc617c0a383664e (diff) | |
Merge branch 'release' into stable
Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/doc/qtqml.qdocconf | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmltimer_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 6cf34ce4e1..5a289767ba 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -8,7 +8,7 @@ version = 5.0.1 qhp.projects = QtQml qhp.QtQml.file = qtqml.qhp -qhp.QtQml.namespace = org.qt-project.qtqml.500 +qhp.QtQml.namespace = org.qt-project.qtqml.501 qhp.QtQml.virtualFolder = qtqml qhp.QtQml.indexTitle = Qt QML qhp.QtQml.indexRoot = diff --git a/src/qml/qml/qqmltimer_p.h b/src/qml/qml/qqmltimer_p.h index ac199e1e42..ff6d6207ff 100644 --- a/src/qml/qml/qqmltimer_p.h +++ b/src/qml/qml/qqmltimer_p.h @@ -53,7 +53,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQmlTimerPrivate; -class Q_AUTOTEST_EXPORT QQmlTimer : public QObject, public QQmlParserStatus +class Q_QML_PRIVATE_EXPORT QQmlTimer : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQmlTimer) |