diff options
Diffstat (limited to 'src/plugins/generic')
-rw-r--r-- | src/plugins/generic/evdevkeyboard/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/evdevmouse/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/evdevtablet/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/evdevtouch/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/generic.pro | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp index ef08cd56ab..5c170e1a06 100644 --- a/src/plugins/generic/evdevkeyboard/main.cpp +++ b/src/plugins/generic/evdevkeyboard/main.cpp @@ -50,7 +50,7 @@ class QEvdevKeyboardPlugin : public QGenericPlugin public: QEvdevKeyboardPlugin(); - QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE; + QObject* create(const QString &key, const QString &specification) override; }; QEvdevKeyboardPlugin::QEvdevKeyboardPlugin() diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp index 86ec7cb575..1b8517f4c4 100644 --- a/src/plugins/generic/evdevmouse/main.cpp +++ b/src/plugins/generic/evdevmouse/main.cpp @@ -50,7 +50,7 @@ class QEvdevMousePlugin : public QGenericPlugin public: QEvdevMousePlugin(); - QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE; + QObject* create(const QString &key, const QString &specification) override; }; QEvdevMousePlugin::QEvdevMousePlugin() diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp index 0646d71146..f43a32910d 100644 --- a/src/plugins/generic/evdevtablet/main.cpp +++ b/src/plugins/generic/evdevtablet/main.cpp @@ -50,7 +50,7 @@ class QEvdevTabletPlugin : public QGenericPlugin public: QEvdevTabletPlugin(); - QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE; + QObject* create(const QString &key, const QString &specification) override; }; QEvdevTabletPlugin::QEvdevTabletPlugin() diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp index aa60614936..f1a0ad53ab 100644 --- a/src/plugins/generic/evdevtouch/main.cpp +++ b/src/plugins/generic/evdevtouch/main.cpp @@ -50,7 +50,7 @@ class QEvdevTouchScreenPlugin : public QGenericPlugin public: QEvdevTouchScreenPlugin(); - QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE; + QObject* create(const QString &key, const QString &specification) override; }; QEvdevTouchScreenPlugin::QEvdevTouchScreenPlugin() diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro index e323f32d2c..980aa1a506 100644 --- a/src/plugins/generic/generic.pro +++ b/src/plugins/generic/generic.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -QT_FOR_CONFIG += gui-private network-private +QT_FOR_CONFIG += gui-private qtConfig(evdev) { SUBDIRS += evdevmouse evdevtouch evdevkeyboard @@ -11,7 +11,7 @@ qtConfig(tslib) { SUBDIRS += tslib } -qtConfig(udpsocket) { +qtConfig(tuiotouch) { SUBDIRS += tuiotouch } |