diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-04 13:26:04 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-04 13:26:04 (GMT) |
| commit | 7905101fb5ef18c776be515b9287356b1efc5ceb (patch) | |
| tree | 3d865c288848891c1790b8dadcf7128410b233c1 /src/gui/widgets/qtextedit.cpp | |
| parent | 49d551b24dbb9131db4a5769b8ddd205bbf99093 (diff) | |
| parent | 94b595f37b3a49d44d1a795e5f2b003ac921d4b7 (diff) | |
| download | Qt-7905101fb5ef18c776be515b9287356b1efc5ceb.zip Qt-7905101fb5ef18c776be515b9287356b1efc5ceb.tar.gz Qt-7905101fb5ef18c776be515b9287356b1efc5ceb.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/widgets/qtextedit.cpp')
| -rw-r--r-- | src/gui/widgets/qtextedit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp index d995e0f..88502e3 100644 --- a/src/gui/widgets/qtextedit.cpp +++ b/src/gui/widgets/qtextedit.cpp @@ -116,9 +116,6 @@ QTextEditPrivate::QTextEditPrivate() preferRichText = false; showCursorOnInitialShow = true; inDrag = false; -#ifdef Q_WS_WIN - setSingleFingerPanEnabled(true); -#endif } void QTextEditPrivate::createAutoBulletList() @@ -186,6 +183,9 @@ void QTextEditPrivate::init(const QString &html) #ifndef QT_NO_CURSOR viewport->setCursor(Qt::IBeamCursor); #endif +#ifdef Q_WS_WIN + setSingleFingerPanEnabled(true); +#endif } void QTextEditPrivate::_q_repaintContents(const QRectF &contentsRect) |