Fix compiler warnings in QtGui, QtWidgets.

- Unused variables.
- Deprecated headers.

Change-Id: I8fb5d5f2cc02aca145a8c857358527592b7491ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-05-22 15:25:02 +02:00 committed by Qt by Nokia
parent 47e8352a00
commit 0a290318fb
3 changed files with 4 additions and 5 deletions

View File

@ -53,7 +53,7 @@
#include <QtGui/QSurfaceFormat>
#include <QtGui/QOpenGLContext>
#include <QtGui/QScreen>
#include <QtGui/QPlatformCursor>
#include <qpa/qplatformcursor.h>
#include <EGL/egl.h>

View File

@ -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

View File

@ -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