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/quick | |
parent | 9e11754fdceae18b49bf1b0947e48b5f81e85d59 (diff) | |
parent | fc0e916784b88a3a9ad12263ecc617c0a383664e (diff) |
Merge branch 'release' into stable
Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/doc/qtquick.qdocconf | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktextedit_p.h | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput_p.h | 2 | ||||
-rw-r--r-- | src/quick/util/qquickbehavior_p.h | 2 | ||||
-rw-r--r-- | src/quick/util/qquickpropertychanges_p.h | 2 | ||||
-rw-r--r-- | src/quick/util/qquickstategroup_p.h | 2 | ||||
-rw-r--r-- | src/quick/util/qquicktransition_p.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index f75ae06539..96ee13bb51 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -9,7 +9,7 @@ version = 5.0.1 qhp.projects = QtQuick qhp.QtQuick.file = qtquick.qhp -qhp.QtQuick.namespace = org.qt-project.qtquick.500 +qhp.QtQuick.namespace = org.qt-project.qtquick.501 qhp.QtQuick.virtualFolder = qtquick qhp.QtQuick.indexTitle = Qt Quick qhp.QtQuick.indexRoot = diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 652b83982d..e88ca16c0e 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickTextEditPrivate; -class Q_AUTOTEST_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem +class Q_QUICK_PRIVATE_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem { Q_OBJECT Q_ENUMS(VAlignment) diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index cad47b576e..83bc125dee 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QQuickTextInputPrivate; class QValidator; -class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem +class Q_QUICK_PRIVATE_EXPORT QQuickTextInput : public QQuickImplicitSizeItem { Q_OBJECT Q_ENUMS(HAlignment) diff --git a/src/quick/util/qquickbehavior_p.h b/src/quick/util/qquickbehavior_p.h index b13e387c9d..a93b597a6b 100644 --- a/src/quick/util/qquickbehavior_p.h +++ b/src/quick/util/qquickbehavior_p.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QQuickAbstractAnimation; class QQuickBehaviorPrivate; -class Q_AUTOTEST_EXPORT QQuickBehavior : public QObject, public QQmlPropertyValueInterceptor +class Q_QUICK_PRIVATE_EXPORT QQuickBehavior : public QObject, public QQmlPropertyValueInterceptor { Q_OBJECT Q_DECLARE_PRIVATE(QQuickBehavior) diff --git a/src/quick/util/qquickpropertychanges_p.h b/src/quick/util/qquickpropertychanges_p.h index 3a4ec6da91..95320afd6d 100644 --- a/src/quick/util/qquickpropertychanges_p.h +++ b/src/quick/util/qquickpropertychanges_p.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickPropertyChangesPrivate; -class Q_AUTOTEST_EXPORT QQuickPropertyChanges : public QQuickStateOperation +class Q_QUICK_PRIVATE_EXPORT QQuickPropertyChanges : public QQuickStateOperation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPropertyChanges) diff --git a/src/quick/util/qquickstategroup_p.h b/src/quick/util/qquickstategroup_p.h index dc5e992a19..ccd928aacf 100644 --- a/src/quick/util/qquickstategroup_p.h +++ b/src/quick/util/qquickstategroup_p.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickStateGroupPrivate; -class Q_AUTOTEST_EXPORT QQuickStateGroup : public QObject, public QQmlParserStatus +class Q_QUICK_PRIVATE_EXPORT QQuickStateGroup : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/quick/util/qquicktransition_p.h b/src/quick/util/qquicktransition_p.h index ed01413703..6ed2ad63cf 100644 --- a/src/quick/util/qquicktransition_p.h +++ b/src/quick/util/qquicktransition_p.h @@ -74,7 +74,7 @@ private: friend class QQuickTransition; }; -class Q_AUTOTEST_EXPORT QQuickTransition : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickTransition : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QQuickTransition) |