10 files changed, 38 insertions, 14 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 33e3b7e1b7..e9527bdc48 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -58,6 +58,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QEnterEvent
     \ingroup events
+    \inmodule QtGui
 
     \brief The QEnterEvent class contains parameters that describe an enter event.
 
@@ -144,6 +145,7 @@ QInputEvent::~QInputEvent()
 /*!
     \class QMouseEvent
     \ingroup events
+    \inmodule QtGui
 
     \brief The QMouseEvent class contains parameters that describe a mouse event.
 
@@ -412,6 +414,7 @@ QMouseEvent::~QMouseEvent()
 /*!
     \class QHoverEvent
     \ingroup events
+    \inmodule QtGui
 
     \brief The QHoverEvent class contains parameters that describe a mouse event.
 
@@ -797,6 +800,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
     \brief The QKeyEvent class describes a key event.
 
     \ingroup events
+    \inmodule QtGui
 
     Key events are sent to the widget with keyboard input focus
     when keys are pressed or released.
@@ -1728,6 +1732,7 @@ QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos)
 
 /*!
     \class QInputMethodEvent::Attribute
+    \inmodule QtGui
     \brief The QInputMethodEvent::Attribute class stores an input method attribute.
 */
 
@@ -1752,7 +1757,7 @@ QInputMethodEvent::QInputMethodEvent()
 }
 
 /*!
-    Construcs an event of type QEvent::InputMethod. The
+    Constructs an event of type QEvent::InputMethod. The
     preedit text is set to \a preeditText, the attributes to
     \a attributes.
 
diff --git a/src/gui/kernel/qgenericplugin.cpp b/src/gui/kernel/qgenericplugin.cpp
index c3301a4e34..98709804de 100644
--- a/src/gui/kernel/qgenericplugin.cpp
+++ b/src/gui/kernel/qgenericplugin.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QGenericPlugin
     \ingroup plugins
+    \inmodule QtGui
 
     \brief The QGenericPlugin class is an abstract base class for
     plugins.
diff --git a/src/gui/kernel/qgenericpluginfactory.cpp b/src/gui/kernel/qgenericpluginfactory.cpp
index cecaf060ce..8e3b45d1a8 100644
--- a/src/gui/kernel/qgenericpluginfactory.cpp
+++ b/src/gui/kernel/qgenericpluginfactory.cpp
@@ -61,6 +61,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 /*!
     \class QGenericPluginFactory
     \ingroup plugins
+    \inmodule QtGui
 
     \brief The QGenericPluginFactory class creates plugin drivers.
 
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index c73eeadbfb..3a8428b332 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -851,15 +851,6 @@ void QGuiApplicationPrivate::createPlatformIntegration()
     // Load the platform integration
     QString platformPluginPath = QLatin1String(qgetenv("QT_QPA_PLATFORM_PLUGIN_PATH"));
 
-    // On Mac, look inside the application bundle for the platform plugin.
-    // TODO (msorvig): Create proper cross-platform solution for loading
-    // deployed platform plugins
-#ifdef Q_OS_MAC
-    const QString bundlePluginPath = QCoreApplication::applicationDirPath() + QLatin1String("../Plugins/");
-    if (platformPluginPath.isEmpty() && QDir(bundlePluginPath).exists()) {
-        platformPluginPath = bundlePluginPath;
-    }
-#endif
 
     QByteArray platformName;
 #ifdef QT_QPA_DEFAULT_PLATFORM_NAME
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index bf3de0de8d..645c13a2ea 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -165,7 +165,7 @@ QOpenGLContext *QOpenGLContextPrivate::setCurrentContext(QOpenGLContext *context
     QGuiGLThreadContext *threadContext = qwindow_context_storage.localData();
     if (!threadContext) {
         if (!QThread::currentThread()) {
-            qWarning("No QTLS available. currentContext wont work");
+            qWarning("No QTLS available. currentContext won't work");
             return 0;
         }
         threadContext = new QGuiGLThreadContext;
@@ -667,7 +667,7 @@ QScreen *QOpenGLContext::screen() const
 }
 
 /*!
-    internal: Needs to have a pointer to qGLContext. But since this is in Qt GUI we cant
+    internal: Needs to have a pointer to qGLContext. But since this is in Qt GUI we can't
     have any type information.
 
     \internal
diff --git a/src/gui/kernel/qplatformsystemtrayicon_qpa.cpp b/src/gui/kernel/qplatformsystemtrayicon_qpa.cpp
index 0976bf320d..13de2c658a 100644
--- a/src/gui/kernel/qplatformsystemtrayicon_qpa.cpp
+++ b/src/gui/kernel/qplatformsystemtrayicon_qpa.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QPlatformSystemTrayIcon
+    \inmodule QtGui
     \brief The QPlatformSystemTrayIcon class abstracts the system tray icon and interaction.
 
     \sa QSystemTray
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index 88a82b12a3..1eec6bfefc 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -42,6 +42,7 @@
 #include "qplatformwindow.h"
 #include "qplatformwindow_p.h"
 
+#include <private/qguiapplication_p.h>
 #include <qpa/qwindowsysteminterface.h>
 #include <QtGui/qwindow.h>
 #include <QtGui/qscreen.h>
@@ -437,6 +438,29 @@ bool QPlatformWindow::frameStrutEventsEnabled() const
 }
 
 /*!
+    Call this method to put together a window title composed of
+    \a title
+    \a separator
+    the application display name
+
+    If the display name isn't set, and the title is empty, the raw app name is used.
+*/
+QString QPlatformWindow::formatWindowTitle(const QString &title, const QString &separator)
+{
+    QString fullTitle = title;
+    if (QGuiApplicationPrivate::displayName) {
+        // Append display name, if set.
+        if (!fullTitle.isEmpty())
+            fullTitle += separator;
+        fullTitle += *QGuiApplicationPrivate::displayName;
+    } else if (fullTitle.isEmpty()) {
+        // Don't let the window title be completely empty, use the app name as fallback.
+        fullTitle = QCoreApplication::applicationName();
+    }
+    return fullTitle;
+}
+
+/*!
     \class QPlatformWindow
     \since 4.8
     \internal
diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h
index 2fa5d3ed0b..e3e460b54c 100644
--- a/src/gui/kernel/qplatformwindow.h
+++ b/src/gui/kernel/qplatformwindow.h
@@ -129,6 +129,8 @@ public:
     virtual bool frameStrutEventsEnabled() const;
 
 protected:
+    static QString formatWindowTitle(const QString &title, const QString &separator);
+
     QScopedPointer<QPlatformWindowPrivate> d_ptr;
 private:
     Q_DISABLE_COPY(QPlatformWindow)
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index 6d42613727..25b603bb9c 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -130,7 +130,6 @@ public:
 
     \value StereoBuffers Used to request stereo buffers in the surface format.
     \value DebugContext Used to request a debug context with extra debugging information.
-        This requires OpenGL version 3.0 or higher.
     \value DeprecatedFunctions Used to request that deprecated functions be included
         in the OpenGL context profile. If not specified, you should get a forward compatible context
         without support functionality marked as deprecated. This requires OpenGL version 3.0 or higher.
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index bf3eb67778..69ae30389e 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1316,7 +1316,7 @@ void QWindow::setFramePosition(const QPoint &point)
     if (d->platformWindow) {
         d->platformWindow->setGeometry(QRect(point, size()));
     } else {
-        d->geometry.setTopLeft(point);
+        d->geometry.moveTopLeft(point);
     }
 }