diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-03 09:37:13 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-03 21:02:32 +0200 |
commit | fd4f165eb78979a3573b9fa1a4a572600f9c47c7 (patch) | |
tree | e7224b89a8dacd37f8f05d83e6208598a4afa3c3 /src/gui/kernel | |
parent | 7108acde8a2838261d6061e75f59c5ff58f37ad4 (diff) |
Fix warnings about unused variables.
Fix MSVC warnings about unused q, d where only static functions
are used.
Change-Id: I239d6fc3c851b0a62434cb09fc0e1967f2e6d031
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/kernel')
-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; } |