summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/kernel')
-rw-r--r--src/widgets/kernel/qguiplatformplugin_p.h2
-rw-r--r--src/widgets/kernel/qsoftkeymanager_common_p.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/kernel/qguiplatformplugin_p.h b/src/widgets/kernel/qguiplatformplugin_p.h
index 3fae6a5cbe..cb1aebb776 100644
--- a/src/widgets/kernel/qguiplatformplugin_p.h
+++ b/src/widgets/kernel/qguiplatformplugin_p.h
@@ -86,7 +86,7 @@ class Q_WIDGETS_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformP
explicit QGuiPlatformPlugin(QObject *parent = 0);
~QGuiPlatformPlugin();
- virtual QStringList keys() const { return QStringList() << QLatin1String("default"); };
+ virtual QStringList keys() const { return QStringList(QStringLiteral("default")); }
virtual QString styleName();
virtual QPalette palette();
diff --git a/src/widgets/kernel/qsoftkeymanager_common_p.h b/src/widgets/kernel/qsoftkeymanager_common_p.h
index bf4c747223..fc484dc3c6 100644
--- a/src/widgets/kernel/qsoftkeymanager_common_p.h
+++ b/src/widgets/kernel/qsoftkeymanager_common_p.h
@@ -53,6 +53,8 @@
// We mean it.
//
+#include <private/qobject_p.h>
+
QT_BEGIN_HEADER
#ifndef QT_NO_SOFTKEYMANAGER
@@ -64,7 +66,7 @@ class QSoftKeyManagerPrivate : public QObjectPrivate
Q_DECLARE_PUBLIC(QSoftKeyManager)
public:
- virtual void updateSoftKeys_sys() {};
+ virtual void updateSoftKeys_sys() {}
protected:
static QSoftKeyManager *self;