9 files changed, 37 insertions, 40 deletions
diff --git a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
index 101ea30bcc..d23ad3bad0 100644
--- a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
+++ b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
@@ -1,10 +1,5 @@
 TARGET = qevdevkeyboardplugin
 
-PLUGIN_TYPE = generic
-PLUGIN_EXTENDS = -
-PLUGIN_CLASS_NAME = QEvdevKeyboardPlugin
-load(qt_plugin)
-
 QT += core-private platformsupport-private gui-private
 
 SOURCES = main.cpp
@@ -12,3 +7,7 @@ SOURCES = main.cpp
 OTHER_FILES += \
     evdevkeyboard.json
 
+PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
+PLUGIN_CLASS_NAME = QEvdevKeyboardPlugin
+load(qt_plugin)
diff --git a/src/plugins/generic/evdevmouse/evdevmouse.pro b/src/plugins/generic/evdevmouse/evdevmouse.pro
index 57a67ead8d..1a0bc08853 100644
--- a/src/plugins/generic/evdevmouse/evdevmouse.pro
+++ b/src/plugins/generic/evdevmouse/evdevmouse.pro
@@ -1,10 +1,5 @@
 TARGET = qevdevmouseplugin
 
-PLUGIN_TYPE = generic
-PLUGIN_EXTENDS = -
-PLUGIN_CLASS_NAME = QEvdevMousePlugin
-load(qt_plugin)
-
 QT += core-private platformsupport-private gui-private
 
 SOURCES = main.cpp
@@ -12,3 +7,7 @@ SOURCES = main.cpp
 OTHER_FILES += \
     evdevmouse.json
 
+PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
+PLUGIN_CLASS_NAME = QEvdevMousePlugin
+load(qt_plugin)
diff --git a/src/plugins/generic/evdevtablet/evdevtablet.pro b/src/plugins/generic/evdevtablet/evdevtablet.pro
index 8ffc0db84d..aaf0ef4c67 100644
--- a/src/plugins/generic/evdevtablet/evdevtablet.pro
+++ b/src/plugins/generic/evdevtablet/evdevtablet.pro
@@ -1,13 +1,13 @@
 TARGET = qevdevtabletplugin
 
-PLUGIN_TYPE = generic
-PLUGIN_EXTENDS = -
-PLUGIN_CLASS_NAME = QEvdevTabletPlugin
-load(qt_plugin)
-
 SOURCES = main.cpp
 
 QT += core-private platformsupport-private gui-private
 
 OTHER_FILES += \
     evdevtablet.json
+
+PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
+PLUGIN_CLASS_NAME = QEvdevTabletPlugin
+load(qt_plugin)
diff --git a/src/plugins/generic/evdevtouch/evdevtouch.pro b/src/plugins/generic/evdevtouch/evdevtouch.pro
index 1f4d1b7e93..4d61db4eb0 100644
--- a/src/plugins/generic/evdevtouch/evdevtouch.pro
+++ b/src/plugins/generic/evdevtouch/evdevtouch.pro
@@ -1,10 +1,5 @@
 TARGET = qevdevtouchplugin
 
-PLUGIN_TYPE = generic
-PLUGIN_EXTENDS = -
-PLUGIN_CLASS_NAME = QEvdevTouchScreenPlugin
-load(qt_plugin)
-
 SOURCES = main.cpp
 
 QT += core-private platformsupport-private gui-private
@@ -12,3 +7,7 @@ QT += core-private platformsupport-private gui-private
 OTHER_FILES += \
     evdevtouch.json
 
+PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
+PLUGIN_CLASS_NAME = QEvdevTouchScreenPlugin
+load(qt_plugin)
diff --git a/src/plugins/generic/libinput/libinput.pro b/src/plugins/generic/libinput/libinput.pro
index 17dbb23ef0..335605d354 100644
--- a/src/plugins/generic/libinput/libinput.pro
+++ b/src/plugins/generic/libinput/libinput.pro
@@ -1,12 +1,12 @@
 TARGET = qlibinputplugin
 
-PLUGIN_TYPE = generic
-PLUGIN_EXTENDS = -
-PLUGIN_CLASS_NAME = QLibInputPlugin
-load(qt_plugin)
-
 QT += core-private platformsupport-private gui-private
 
 SOURCES = main.cpp
 
 OTHER_FILES = libinput.json
+
+PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
+PLUGIN_CLASS_NAME = QLibInputPlugin
+load(qt_plugin)
diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro
index be6fc4fbea..200d231cc8 100644
--- a/src/plugins/generic/tslib/tslib.pro
+++ b/src/plugins/generic/tslib/tslib.pro
@@ -1,10 +1,5 @@
 TARGET = qtslibplugin
 
-PLUGIN_TYPE = generic
-PLUGIN_EXTENDS = -
-PLUGIN_CLASS_NAME = QTsLibPlugin
-load(qt_plugin)
-
 SOURCES = main.cpp
 
 QT += gui-private platformsupport-private
@@ -12,3 +7,8 @@ QT += gui-private platformsupport-private
 LIBS += -lts
 
 OTHER_FILES += tslib.json
+
+PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
+PLUGIN_CLASS_NAME = QTsLibPlugin
+load(qt_plugin)
diff --git a/src/plugins/generic/tuiotouch/qoscbundle.cpp b/src/plugins/generic/tuiotouch/qoscbundle.cpp
index ef5ca5b5f1..26dabebd23 100644
--- a/src/plugins/generic/tuiotouch/qoscbundle.cpp
+++ b/src/plugins/generic/tuiotouch/qoscbundle.cpp
@@ -122,7 +122,7 @@ QOscBundle::QOscBundle(const QByteArray &data)
         if (size == 0) {
             // empty bundle; these are valid, but should they be allowed? the
             // spec is unclear on this...
-            qWarning() << "Empty bundle?";
+            qWarning("Empty bundle?");
             m_isValid = true;
             m_immediate = isImmediate;
             m_timeEpoch = oscTimeEpoch;
@@ -152,7 +152,7 @@ QOscBundle::QOscBundle(const QByteArray &data)
                 m_timePico = oscTimePico;
                 m_messages.append(subMessage);
             } else {
-                qWarning() << "Invalid sub-message";
+                qWarning("Invalid sub-message");
                 return;
             }
         } else if (subdata.startsWith(bundleIdentifier)) {
@@ -166,7 +166,7 @@ QOscBundle::QOscBundle(const QByteArray &data)
                 m_bundles.append(subBundle);
             }
         } else {
-            qWarning() << "Malformed sub-data!";
+            qWarning("Malformed sub-data!");
             return;
         }
     }
diff --git a/src/plugins/generic/tuiotouch/qtuiohandler.cpp b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
index e2c4bf9dc4..6026e06b55 100644
--- a/src/plugins/generic/tuiotouch/qtuiohandler.cpp
+++ b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
@@ -165,7 +165,7 @@ void QTuioHandler::processPackets()
 
             QList<QVariant> arguments = message.arguments();
             if (arguments.count() == 0) {
-                qWarning() << "Ignoring TUIO message with no arguments";
+                qWarning("Ignoring TUIO message with no arguments");
                 continue;
             }
 
@@ -195,7 +195,7 @@ void QTuioHandler::process2DCurSource(const QOscMessage &message)
     }
 
     if (QMetaType::Type(arguments.at(1).type()) != QMetaType::QByteArray) {
-        qWarning() << "Ignoring malformed TUIO source message (bad argument type)";
+        qWarning("Ignoring malformed TUIO source message (bad argument type)");
         return;
     }
 
diff --git a/src/plugins/generic/tuiotouch/tuiotouch.pro b/src/plugins/generic/tuiotouch/tuiotouch.pro
index 5e53403f5b..ae2ccde058 100644
--- a/src/plugins/generic/tuiotouch/tuiotouch.pro
+++ b/src/plugins/generic/tuiotouch/tuiotouch.pro
@@ -1,10 +1,5 @@
 TARGET = qtuiotouchplugin
 
-PLUGIN_TYPE = generic
-PLUGIN_EXTENDS = -
-PLUGIN_CLASS_NAME = QTuioTouchPlugin
-load(qt_plugin)
-
 QT += \
     core-private \
     gui-private \
@@ -24,3 +19,8 @@ HEADERS += \
 
 OTHER_FILES += \
     tuiotouch.json
+
+PLUGIN_TYPE = generic
+PLUGIN_EXTENDS = -
+PLUGIN_CLASS_NAME = QTuioTouchPlugin
+load(qt_plugin)