diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /src/widgets/widgets/qtextedit.cpp | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'src/widgets/widgets/qtextedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 3eaf60116e..6ea67d385e 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -39,7 +39,9 @@ #include "qtextedit_p.h" #include "qlineedit.h" +#if QT_CONFIG(textbrowser) #include "qtextbrowser.h" +#endif #ifndef QT_NO_TEXTEDIT #include <qfont.h> @@ -243,7 +245,7 @@ void QTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCursor::Mo control->setTextCursor(cursor); } -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) static QSize documentSize(QWidgetTextControl *control) { QTextDocument *doc = control->document(); @@ -2155,7 +2157,7 @@ void QTextEdit::setReadOnly(bool ro) Qt::TextInteractionFlags flags = Qt::NoTextInteraction; if (ro) { flags = Qt::TextSelectableByMouse; -#ifndef QT_NO_TEXTBROWSER +#if QT_CONFIG(textbrowser) if (qobject_cast<QTextBrowser *>(this)) flags |= Qt::TextBrowserInteraction; #endif |