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/items | |
| parent | 9e11754fdceae18b49bf1b0947e48b5f81e85d59 (diff) | |
| parent | fc0e916784b88a3a9ad12263ecc617c0a383664e (diff) | |
Merge branch 'release' into stable
Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquicktextedit_p.h | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicktextinput_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
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) |