Merge branch 'master' into refactor

Conflicts:
	src/gui/kernel/qapplication_qpa.cpp
	src/gui/kernel/qcursor_qpa.cpp
	src/gui/kernel/qwindowsysteminterface_qpa.cpp
	src/gui/kernel/qwindowsysteminterface_qpa.h
	src/gui/kernel/qwindowsysteminterface_qpa_p.h
	src/gui/text/qtextcontrol.cpp
	src/plugins/platforms/wayland/wayland.pro
	src/widgets/accessible/qaccessible2.h
	src/widgets/widgets/qwidgetlinecontrol_p.h

Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74

diff --cc src/plugins/platforms/wayland/qwaylandclipboard.cpp
index da5da42,45f0abc..f90d1a9
--- 1/src/plugins/platforms/wayland/qwaylandclipboard.cpp
--- 2/src/plugins/platforms/wayland/qwaylandclipboard.cpp
+++ b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
@@@ -42,8 -42,9 +42,9 @@@
  #include "qwaylandclipboard.h"
  #include "qwaylanddisplay.h"
  #include "qwaylandinputdevice.h"
+ #include "qwaylandmime.h"
  #include <QtGui/QPlatformNativeInterface>
 -#include <QtGui/QApplication>
 +#include <QtGui/QGuiApplication>
  #include <QtCore/QMimeData>
  #include <QtCore/QStringList>
  #include <QtCore/QFile>

diff --cc src/plugins/platforms/wayland/wayland.pro
index a46f508,1e0bbe6..fd6ffc0
--- 1/src/plugins/platforms/wayland/wayland.pro
--- 2/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@@ -25,7 -21,7 +25,8 @@@ SOURCES =   main.cpp 
              qwaylandscreen.cpp \
              qwaylandshmwindow.cpp \
              qwaylandclipboard.cpp \
-             qwaylanddnd.cpp
++            qwaylanddnd.cpp \
+             qwaylandmime.cpp
  
  HEADERS =   qwaylandintegration.h \
              qwaylandnativeinterface.h \
@@@ -37,7 -33,7 +38,8 @@@
              qwaylandbuffer.h \
              qwaylandshmwindow.h \
              qwaylandclipboard.h \
-             qwaylanddnd.h
++            qwaylanddnd.h \
+             qwaylandmime.h
  
  INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND
  LIBS += $$QMAKE_LIBS_WAYLAND