Merge 5.5 into 5.5.0

Change-Id: I27921a25a0fc56afb5429e40fc1e9b4b9a645a9a

1 files changed, 3 insertions, 3 deletions

diff --git a/examples/opengl/qopenglwidget/glwidget.cpp b/examples/opengl/qopenglwidget/glwidget.cpp
index f93e667615..df52e3efbf 100644
--- a/examples/opengl/qopenglwidget/glwidget.cpp
+++ b/examples/opengl/qopenglwidget/glwidget.cpp
@@ -537,14 +537,14 @@ void GLWidget::setTransparent(bool transparent)
     window()->update();
 }
 
-void GLWidget::resizeGL(int w, int h)
+void GLWidget::resizeGL(int, int)
 {
     if (m_hasButton) {
         if (!m_btn) {
-            m_btn = new QPushButton("A widget on top.\nPress me!", this);
+            m_btn = new QPushButton("A widget on top.\nPress for more widgets.", this);
             connect(m_btn, &QPushButton::clicked, this, &GLWidget::handleButtonPress);
         }
-        m_btn->move(w / 2, h / 2);
+        m_btn->move(20, 80);
     }
 }