Regenerate plugin projects to get new target names

And also to get the original output names (qmake's "TARGET"), so that
the plugin file names are as they were in Qt 5.

Change-Id: I96a060d1a81693652847857372bec334728cb549
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

9 files changed, 41 insertions, 42 deletions

diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt
index d3d46bebbb..a75d28e19d 100644
--- a/src/plugins/sqldrivers/db2/CMakeLists.txt
+++ b/src/plugins/sqldrivers/db2/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from db2.pro.
 
 #####################################################################
-## qsqldb2 Plugin:
+## QDB2DriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qsqldb2
+qt_add_plugin(QDB2DriverPlugin
+    OUTPUT_NAME qsqldb2
     TYPE sqldrivers
-    CLASS_NAME QDB2DriverPlugin
     SOURCES
         main.cpp
         qsql_db2.cpp qsql_db2_p.h
@@ -28,7 +28,7 @@ qt_add_plugin(qsqldb2
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qsqldb2 CONDITION (TEST_architecture_arch STREQUAL "x86_64")
+qt_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STREQUAL "x86_64")
     DEFINES
         ODBC64
 )
diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt
index e55a062c9b..7a55786300 100644
--- a/src/plugins/sqldrivers/mysql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from mysql.pro.
 
 #####################################################################
-## qsqlmysql Plugin:
+## QMYSQLDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qsqlmysql
+qt_add_plugin(QMYSQLDriverPlugin
+    OUTPUT_NAME qsqlmysql
     TYPE sqldrivers
-    CLASS_NAME QMYSQLDriverPlugin
     SOURCES
         main.cpp
         qsql_mysql.cpp qsql_mysql_p.h
diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt
index 3215b87c46..d3c1d0c74c 100644
--- a/src/plugins/sqldrivers/oci/CMakeLists.txt
+++ b/src/plugins/sqldrivers/oci/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from oci.pro.
 
 #####################################################################
-## qsqloci Plugin:
+## QOCIDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qsqloci
+qt_add_plugin(QOCIDriverPlugin
+    OUTPUT_NAME qsqloci
     TYPE sqldrivers
-    CLASS_NAME QOCIDriverPlugin
     SOURCES
         main.cpp
         qsql_oci.cpp qsql_oci_p.h
@@ -28,7 +28,7 @@ qt_add_plugin(qsqloci
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qsqloci CONDITION APPLE
+qt_extend_target(QOCIDriverPlugin CONDITION APPLE
     LINK_OPTIONS
         "-Wl,-flat_namespace,-U,_environ"
 )
diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
index 5eda5899cf..2452d50989 100644
--- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from odbc.pro.
 
 #####################################################################
-## qsqlodbc Plugin:
+## QODBCDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qsqlodbc
+qt_add_plugin(QODBCDriverPlugin
+    OUTPUT_NAME qsqlodbc
     TYPE sqldrivers
-    CLASS_NAME QODBCDriverPlugin
     SOURCES
         main.cpp
         qsql_odbc.cpp qsql_odbc_p.h
@@ -28,7 +28,7 @@ qt_add_plugin(qsqlodbc
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qsqlodbc CONDITION UNIX
+qt_extend_target(QODBCDriverPlugin CONDITION UNIX
     DEFINES
         UNICODE
 )
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
index 871e87a4c1..0e19306786 100644
--- a/src/plugins/sqldrivers/odbc/CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -1,14 +1,13 @@
 # Generated from odbc.pro.
 
 #####################################################################
-## qsqlodbc Plugin:
+## QODBCDriverPlugin Plugin:
 #####################################################################
 
 qt_find_package(ODBC) # special case
-
-qt_add_plugin(qsqlodbc
+qt_add_plugin(QODBCDriverPlugin
+    OUTPUT_NAME qsqlodbc
     TYPE sqldrivers
-    CLASS_NAME QODBCDriverPlugin
     SOURCES
         main.cpp
         qsql_odbc.cpp qsql_odbc_p.h
@@ -30,7 +29,7 @@ qt_add_plugin(qsqlodbc
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qsqlodbc CONDITION UNIX
+qt_extend_target(QODBCDriverPlugin CONDITION UNIX
     DEFINES
         UNICODE
 )
diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
index 4047c6b1f6..7df66eeb51 100644
--- a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from psql.pro.
 
 #####################################################################
-## qsqlpsql Plugin:
+## QPSQLDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qsqlpsql
+qt_add_plugin(QPSQLDriverPlugin
+    OUTPUT_NAME qsqlpsql
     TYPE sqldrivers
-    CLASS_NAME QPSQLDriverPlugin
     SOURCES
         main.cpp
         qsql_psql.cpp qsql_psql_p.h
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
index 46ad12677e..e4f794f523 100644
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -6,12 +6,12 @@
 qt_find_package(PostgreSQL) # special case
 
 #####################################################################
-## qsqlpsql Plugin:
+## QPSQLDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qsqlpsql
+qt_add_plugin(QPSQLDriverPlugin
+    OUTPUT_NAME qsqlpsql
     TYPE sqldrivers
-    CLASS_NAME QPSQLDriverPlugin
     SOURCES
         main.cpp
         qsql_psql.cpp qsql_psql_p.h
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
index ae08f26cb9..6e17dfe302 100644
--- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from sqlite.pro.
 
 #####################################################################
-## qsqlite Plugin:
+## QSQLiteDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qsqlite
+qt_add_plugin(QSQLiteDriverPlugin
+    OUTPUT_NAME qsqlite
     TYPE sqldrivers
-    CLASS_NAME QSQLiteDriverPlugin
     SOURCES
         qsql_sqlite.cpp qsql_sqlite_p.h
         smain.cpp
@@ -28,12 +28,12 @@ qt_add_plugin(qsqlite
 ## Scopes:
 #####################################################################
 
-qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite
+qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite
     PUBLIC_LIBRARIES
         sqlite
 )
 
-qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite
+qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite
     SOURCES
         ../../../3rdparty/sqlite/sqlite3.c
     DEFINES
@@ -48,22 +48,22 @@ qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite
         ../../../3rdparty/sqlite
 )
 
-qt_extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite
+qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite
     DEFINES
         NDEBUG
 )
 
-qt_extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite
+qt_extend_target(QSQLiteDriverPlugin CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite
     DEFINES
         SQLITE_DISABLE_LFS
 )
 
-qt_extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite
+qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite
     DEFINES
         HAVE_POSIX_FALLOCATE=1
 )
 
-qt_extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite
+qt_extend_target(QSQLiteDriverPlugin CONDITION WINRT AND NOT QT_FEATURE_system_sqlite
     DEFINES
         SQLITE_OS_WINRT
 )
@@ -71,22 +71,22 @@ qt_extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite
 #### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT:
 # QMAKE_CFLAGS = "-Gy"
 
-qt_extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite
+qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite
     DEFINES
         _QNX_SOURCE
 )
 
-qt_extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone
+qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone
     DEFINES
         HAVE_USLEEP=1
 )
 
-qt_extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
+qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
+qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
     DEFINES
         SQLITE_OMIT_LOAD_EXTENSION
 )
diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
index 35fe8e69de..98c94a426a 100644
--- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt
+++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from sqlite.pro.
 
 #####################################################################
-## qsqlite Plugin:
+## QSQLiteDriverPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qsqlite
+qt_add_plugin(QSQLiteDriverPlugin
+    OUTPUT_NAME qsqlite
     TYPE sqldrivers
-    CLASS_NAME QSQLiteDriverPlugin
     SOURCES
         qsql_sqlite.cpp qsql_sqlite_p.h
         smain.cpp