diff options
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfsintegration.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/widgets/qmenubar.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp index a62d3bdaed..d55ce53649 100644 --- 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 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 |