diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:05:02 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:05:02 +0200 |
| commit | ca524e5b70ccfeb6386cf0c5df83ffb86a8771fe (patch) | |
| tree | 245c471373516ccda2b0c91943a42cd74674f2da /examples | |
| parent | b08cc0ec6f096d0e6764486c81264c24a406bee1 (diff) | |
| parent | c2badc7423b63824902d1f44a4b804de3335c20b (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Manually included changes from
3a347a4e70e5a10ee92dd2578316c926a399e894
in src/opengl/qgl.cpp.
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/android/androidjnimain.cpp
Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/richtext/textedit/textedit.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 2ff7a09969..b161c271aa 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -104,6 +104,9 @@ TextEdit::TextEdit(QWidget *parent) textEdit->setFocus(); setCurrentFileName(QString()); + QFont textFont("Helvetica"); + textFont.setStyleHint(QFont::SansSerif); + textEdit->setFont(textFont); fontChanged(textEdit->font()); colorChanged(textEdit->textColor()); alignmentChanged(textEdit->alignment()); |