Fix compiler warnings in QtGui, QtWidgets.

- Unused variables.
- Deprecated headers.

Change-Id: I8fb5d5f2cc02aca145a8c857358527592b7491ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
index a62d3bd..d55ce53 100644 (file)
--- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
@@ -53,7 +53,7 @@
 #include <QtGui/QSurfaceFormat>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QScreen>
-#include <QtGui/QPlatformCursor>
+#include <qpa/qplatformcursor.h>
 
 #include <EGL/egl.h>
 

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 93ad779..f4a565c 100644 (file)
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -4512,10 +4512,9 @@ QGestureManager* QGestureManager::instance()
 
 QPixmap QApplicationPrivate::applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const
 {
-    Q_Q(const QApplication);
     QStyleOption opt(0);
-    opt.palette = q->palette();
-    return q->style()->generatedIconPixmap(mode, base, &opt);
+    opt.palette = QGuiApplication::palette();
+    return QApplication::style()->generatedIconPixmap(mode, base, &opt);
 }
 
 QT_END_NAMESPACE

diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index fc28cd6..d22a21b 100644 (file)
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -57,7 +57,7 @@
 #include <qwhatsthis.h>
 #include <qpa/qplatformtheme.h>
 #include "private/qguiapplication_p.h"
-#include "qplatformintegration_qpa.h"
+#include "qpa/qplatformintegration.h"
 
 #ifndef QT_NO_MENUBAR