diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.cpp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 0f5c218e52..1a399dc0ae 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -604,12 +604,10 @@ static void init_plugins(const QList<QByteArray> &pluginList) void QGuiApplicationPrivate::createPlatformIntegration() { - Q_Q(QGuiApplication); - // Use the Qt menus by default. Platform plugins that // want to enable a native menu implementation can clear // this flag. - q->setAttribute(Qt::AA_DontUseNativeMenuBar, true); + QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true); // Load the platform integration QString platformPluginPath = QLatin1String(qgetenv("QT_QPA_PLATFORM_PLUGIN_PATH")); diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp index 04610890dc..8612b4b42f 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp @@ -244,15 +244,14 @@ void QPlatformInputContext::setFocusObject(QObject *object) */ bool QPlatformInputContext::inputMethodAccepted() const { - Q_D(const QPlatformInputContext); - return d->s_inputMethodAccepted; + return QPlatformInputContextPrivate::s_inputMethodAccepted; } bool QPlatformInputContextPrivate::s_inputMethodAccepted = false; void QPlatformInputContextPrivate::setInputMethodAccepted(bool accepted) { - s_inputMethodAccepted = accepted; + QPlatformInputContextPrivate::s_inputMethodAccepted = accepted; } |