7 files changed, 25 insertions, 23 deletions
diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt
index 8aee553d86..d3471f4e63 100644
--- a/src/plugins/bearer/android/src/CMakeLists.txt
+++ b/src/plugins/bearer/android/src/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from src.pro.
 
 #####################################################################
-## qandroidbearer Plugin:
+## QAndroidBearerEnginePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qandroidbearer
+qt_add_plugin(QAndroidBearerEnginePlugin
+    OUTPUT_NAME qandroidbearer
     TYPE bearer
-    CLASS_NAME QAndroidBearerEnginePlugin
     SOURCES
         main.cpp
         qandroidbearerengine.cpp qandroidbearerengine.h
diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt
index 1dc42fcce3..55aaa41491 100644
--- a/src/plugins/bearer/connman/.prev_CMakeLists.txt
+++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt
@@ -1,12 +1,13 @@
 # Generated from connman.pro.
 
 #####################################################################
-## qconnmanbearer Plugin:
+## QConnmanEnginePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qconnmanbearer
-    TYPE bearer
+qt_add_plugin(QConnmanEnginePlugin
+    OUTPUT_NAME qconnmanbearer
     CLASS_NAME QConnmanEnginePlugin
+    TYPE bearer
     SOURCES
         main.cpp
         qconnmanengine.cpp qconnmanengine.h
diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt
index 1dc42fcce3..6e5f34f6a4 100644
--- a/src/plugins/bearer/connman/CMakeLists.txt
+++ b/src/plugins/bearer/connman/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from connman.pro.
 
 #####################################################################
-## qconnmanbearer Plugin:
+## QConnmanEnginePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qconnmanbearer
+qt_add_plugin(QConnmanEnginePlugin
+    OUTPUT_NAME qconnmanbearer
     TYPE bearer
-    CLASS_NAME QConnmanEnginePlugin
     SOURCES
         main.cpp
         qconnmanengine.cpp qconnmanengine.h
diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt
index 914f5ceae1..eda3b85499 100644
--- a/src/plugins/bearer/corewlan/CMakeLists.txt
+++ b/src/plugins/bearer/corewlan/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from corewlan.pro.
 
 #####################################################################
-## qcorewlanbearer Plugin:
+## QCoreWlanEnginePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qcorewlanbearer
+qt_add_plugin(QCoreWlanEnginePlugin
+    OUTPUT_NAME qcorewlanbearer
     TYPE bearer
-    CLASS_NAME QCoreWlanEnginePlugin
     SOURCES
         main.cpp
         qcorewlanengine.h qcorewlanengine.mm
@@ -26,7 +26,7 @@ qt_add_plugin(qcorewlanbearer
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qcorewlanbearer CONDITION QT_FEATURE_corewlan
+qt_extend_target(QCoreWlanEnginePlugin CONDITION QT_FEATURE_corewlan
     PUBLIC_LIBRARIES
         ${FWCoreWLAN}
         ${FWSecurity}
diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt
index c41688e82a..0717b83dd3 100644
--- a/src/plugins/bearer/generic/CMakeLists.txt
+++ b/src/plugins/bearer/generic/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from generic.pro.
 
 #####################################################################
-## qgenericbearer Plugin:
+## QGenericEnginePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qgenericbearer
+qt_add_plugin(QGenericEnginePlugin
+    OUTPUT_NAME qgenericbearer
     TYPE bearer
-    CLASS_NAME QGenericEnginePlugin
     SOURCES
         ../platformdefs_win.h
         main.cpp
@@ -25,7 +25,7 @@ qt_add_plugin(qgenericbearer
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT
+qt_extend_target(QGenericEnginePlugin CONDITION WIN32 AND NOT WINRT
     PUBLIC_LIBRARIES
         iphlpapi
 )
diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt
index 2d86926aff..df5927024d 100644
--- a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt
+++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt
@@ -1,12 +1,13 @@
 # Generated from networkmanager.pro.
 
 #####################################################################
-## qnmbearer Plugin:
+## QNetworkManagerEnginePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qnmbearer
-    TYPE bearer
+qt_add_plugin(QNetworkManagerEnginePlugin
+    OUTPUT_NAME qnmbearer
     CLASS_NAME QNetworkManagerEnginePlugin
+    TYPE bearer
     SOURCES
         main.cpp
         qnetworkmanagerengine.cpp qnetworkmanagerengine.h
diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt
index 2d86926aff..9c9721cca7 100644
--- a/src/plugins/bearer/networkmanager/CMakeLists.txt
+++ b/src/plugins/bearer/networkmanager/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from networkmanager.pro.
 
 #####################################################################
-## qnmbearer Plugin:
+## QNetworkManagerEnginePlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qnmbearer
+qt_add_plugin(QNetworkManagerEnginePlugin
+    OUTPUT_NAME qnmbearer
     TYPE bearer
-    CLASS_NAME QNetworkManagerEnginePlugin
     SOURCES
         main.cpp
         qnetworkmanagerengine.cpp qnetworkmanagerengine.h