diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-22 15:25:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-23 23:55:43 +0200 |
| commit | 0a290318fbd0e34a9d97922c75f350c326c24930 (patch) | |
| tree | 82189d4d02e134ea18dac6ddaca131f7d85d2d39 /src/widgets | |
| parent | 47e8352a00fb46945ed7bcfd2abfe66a8ae36992 (diff) | |
Fix compiler warnings in QtGui, QtWidgets.
- Unused variables.
- Deprecated headers.
Change-Id: I8fb5d5f2cc02aca145a8c857358527592b7491ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/widgets/qmenubar.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 93ad779b7c..f4a565c4d0 100644 --- 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 fc28cd6d1c..d22a21b13d 100644 --- 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 |