diff options
| author | mread <qt-info@nokia.com> | 2009-08-07 13:34:12 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-07 13:34:12 (GMT) |
| commit | 5a72890b7ce12815f9567316da867006cff73f39 (patch) | |
| tree | 46c8c793f19274f9ed19678d1732d2123adbdf34 /src/gui/text/qtextcontrol_p.h | |
| parent | 0f6f1f841cea61cbb6905de92c2ca63bd369d55d (diff) | |
| parent | cc0a411e5e874aa224c26298a109973cb15ea291 (diff) | |
| download | Qt-5a72890b7ce12815f9567316da867006cff73f39.zip Qt-5a72890b7ce12815f9567316da867006cff73f39.tar.gz Qt-5a72890b7ce12815f9567316da867006cff73f39.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts fixed:
src/corelib/io/qdiriterator.cpp
Diffstat (limited to 'src/gui/text/qtextcontrol_p.h')
| -rw-r--r-- | src/gui/text/qtextcontrol_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h index 8ba6a06..eb0d749 100644 --- a/src/gui/text/qtextcontrol_p.h +++ b/src/gui/text/qtextcontrol_p.h @@ -83,10 +83,10 @@ class QAbstractScrollArea; class QEvent; class QTimerEvent; -class Q_AUTOTEST_EXPORT QTextControl : public QObject +class Q_GUI_EXPORT QTextControl : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QTextControl) + Q_DECLARE_PRIVATE(QTextControl) #ifndef QT_NO_TEXTHTMLPARSER Q_PROPERTY(QString html READ toHtml WRITE setHtml NOTIFY textChanged USER true) #endif |