Merge branch 'refactor'

Conflicts:
	mkspecs/qws/linux-lsb-g++/qmake.conf
	src/gui/image/qpixmap_mac.cpp
	src/gui/painting/qpaintengine_x11.cpp
	src/gui/painting/qtessellator.cpp
	src/gui/text/qfontengine_qws.cpp
	src/gui/text/qfontengine_x11.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/opengl/qgl.h
	src/opengl/qgl_x11egl.cpp
	src/plugins/plugins.pro

Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310

1 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index a7868ba1a1..9ca06aaa98 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -43,7 +43,7 @@
 
 #ifndef QT_NO_CURSOR
 
-#include <qapplication.h>
+#include <qcoreapplication.h>
 #include <qbitmap.h>
 #include <qimage.h>
 #include <qdatastream.h>
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 
     To associate a cursor with a widget, use QWidget::setCursor(). To
     associate a cursor with all widgets (normally for a short period
-    of time), use QApplication::setOverrideCursor().
+    of time), use QGuiApplication::setOverrideCursor().
 
     To set a cursor shape use QCursor::setShape() or use the QCursor
     constructor which takes the shape as argument, or you can use one
@@ -85,9 +85,9 @@ QT_BEGIN_NAMESPACE
     methods QCursor::pos() and QCursor::setPos().
 
     \bold{Note:} It is possible to create a QCursor before
-    QApplication, but it is not useful except as a place-holder for a
-    real QCursor created after QApplication. Attempting to use a
-    QCursor that was created before QApplication will result in a
+    QGuiApplication, but it is not useful except as a place-holder for a
+    real QCursor created after QGuiApplication. Attempting to use a
+    QCursor that was created before QGuiApplication will result in a
     crash.
 
     \section1 A Note for X11 Users
@@ -410,7 +410,7 @@ void QCursorData::initialize()
 QCursor::QCursor()
 {
     if (!QCursorData::initialized) {
-        if (QApplication::startingUp()) {
+        if (QCoreApplication::startingUp()) {
             d = 0;
             return;
         }