Merge remote-tracking branch 'origin/api_changes' into containters

Conflicts:
	src/corelib/kernel/qmetaobject.cpp
	src/corelib/kernel/qvariant.cpp
	src/tools/moc/moc.h

Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6

1 files changed, 11 insertions, 13 deletions

diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 3e0bec8d46..1edb243f4e 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -205,18 +205,18 @@ static bool shouldShowMaximizeButton(Qt::WindowFlags flags)
     Window creation is split in 3 steps:
 
     \list
-    \o fromWindow() Gather all required information
-    \o create() Create the system handle.
-    \o initialize() Post creation initialization steps.
+    \li fromWindow() Gather all required information
+    \li create() Create the system handle.
+    \li initialize() Post creation initialization steps.
     \endlist
 
     The reason for this split is to also enable changing the QWindowFlags
     by calling:
 
     \list
-    \o fromWindow() Gather information and determine new system styles
-    \o applyWindowFlags() to apply the new window system styles.
-    \o initialize() Post creation initialization steps.
+    \li fromWindow() Gather information and determine new system styles
+    \li applyWindowFlags() to apply the new window system styles.
+    \li initialize() Post creation initialization steps.
     \endlist
 
     Contains the window creation code formerly in qwidget_win.cpp.
@@ -594,13 +594,13 @@ QWindowCreationContext::QWindowCreationContext(const QWindow *w,
     \brief Raster or OpenGL Window.
 
     \list
-    \o Raster type: handleWmPaint() is implemented to
+    \li Raster type: handleWmPaint() is implemented to
        to bitblt the image. The DC can be accessed
        via getDC/Relase DC, which has a special handling
        when within a paint event (in that case, the DC obtained
        from BeginPaint() is returned).
 
-    \o Open GL: The first time QWindowsGLContext accesses
+    \li Open GL: The first time QWindowsGLContext accesses
        the handle, it sets up the pixelformat on the DC
        which in turn sets it on the window (see flag
        PixelFormatInitialized).
@@ -618,7 +618,7 @@ QWindowsWindow::QWindowsWindow(QWindow *aWindow, const WindowData &data) :
     m_windowState(aWindow->windowState()),
     m_opacity(1.0),
     m_mouseGrab(false),
-    m_cursor(QWindowsScreen::screenOf(aWindow)->cursor().standardWindowCursor()),
+    m_cursor(QWindowsScreen::screenOf(aWindow)->windowsCursor()->standardWindowCursor()),
     m_dropTarget(0),
     m_savedStyle(0)
 {
@@ -1309,16 +1309,14 @@ void QWindowsWindow::getSizeHints(MINMAXINFO *mmi) const
 }
 
 /*!
-    \brief Applies to cursor property set on the window to the global cursor
-    unless there is an override cursor.
+    \brief Applies to cursor property set on the window to the global cursor.
 
     \sa QWindowsCursor
 */
 
 void QWindowsWindow::applyCursor()
 {
-    if (!QGuiApplication::overrideCursor())
-        SetCursor(m_cursor.handle());
+    SetCursor(m_cursor.handle());
 }
 
 void QWindowsWindow::setCursor(const QWindowsWindowCursor &c)