Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I2811ff0b9d4097f0be60ff16e9664a5060cff23e

3 files changed, 7 insertions, 7 deletions

diff --git a/examples/opengl/qopenglwidget/mainwindow.cpp b/examples/opengl/qopenglwidget/mainwindow.cpp
index 152ce8601b..7645c75d8c 100644
--- a/examples/opengl/qopenglwidget/mainwindow.cpp
+++ b/examples/opengl/qopenglwidget/mainwindow.cpp
@@ -95,12 +95,9 @@ MainWindow::MainWindow()
 
     groupBox->setLayout(m_layout);
 
-    QMenu *fileMenu = new QMenu("&File");
-    QMenu *helpMenu = new QMenu("&Help");
-    QMenu *showMenu = new QMenu("&Show");
-    menuBar()->addMenu(fileMenu);
-    menuBar()->addMenu(showMenu);
-    menuBar()->addMenu(helpMenu);
+    QMenu *fileMenu = menuBar()->addMenu("&File");
+    QMenu *showMenu = menuBar()->addMenu("&Show");
+    QMenu *helpMenu = menuBar()->addMenu("&Help");
     QAction *exit = new QAction("E&xit", fileMenu);
     QAction *aboutQt = new QAction("About Qt", helpMenu);
     QAction *showLogo = new QAction("Show 3D Logo", showMenu);
diff --git a/examples/opengl/qopenglwindow/main.cpp b/examples/opengl/qopenglwindow/main.cpp
index a67bcbb2e3..bf95d09ecd 100644
--- a/examples/opengl/qopenglwindow/main.cpp
+++ b/examples/opengl/qopenglwindow/main.cpp
@@ -185,7 +185,7 @@ int main(int argc, char **argv)
     fmt.setDepthBufferSize(24);
     fmt.setStencilBufferSize(8);
     window.setFormat(fmt);
-    window.show();
+    window.showMaximized();
 
     return app.exec();
 }
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());