Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7

7 files changed, 32 insertions, 35 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/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)