6 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/imageformats/gif/.prev_CMakeLists.txt b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
index b4923b81b1..c071c1d785 100644
--- a/src/plugins/imageformats/gif/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QGifPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QGifPlugin
+qt_internal_add_plugin(QGifPlugin
     OUTPUT_NAME qgif
     TYPE imageformats
     SOURCES
diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt
index c6780e32e9..9a9150bccc 100644
--- a/src/plugins/imageformats/gif/CMakeLists.txt
+++ b/src/plugins/imageformats/gif/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QGifPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QGifPlugin
+qt_internal_add_plugin(QGifPlugin
     OUTPUT_NAME qgif
     TYPE imageformats
     SOURCES
diff --git a/src/plugins/imageformats/ico/.prev_CMakeLists.txt b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
index 6151d6fd07..53332f8c35 100644
--- a/src/plugins/imageformats/ico/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
@@ -4,16 +4,15 @@
 ## QICOPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QICOPlugin
+add_qt_plugin(QICOPlugin
     OUTPUT_NAME qico
     TYPE imageformats
     SOURCES
         main.cpp main.h
         qicohandler.cpp qicohandler.h
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
 )
 
diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt
index 1174848d5e..c5362df3e9 100644
--- a/src/plugins/imageformats/ico/CMakeLists.txt
+++ b/src/plugins/imageformats/ico/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QICOPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QICOPlugin
+qt_internal_add_plugin(QICOPlugin
     OUTPUT_NAME qico
     TYPE imageformats
     SOURCES
diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
index a02c8f05ed..bf9b12e703 100644
--- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## QJpegPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QJpegPlugin
+qt_internal_add_plugin(QJpegPlugin
     OUTPUT_NAME qjpeg
     TYPE imageformats
     SOURCES
diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt
index 13d28c7b8b..2542a86eed 100644
--- a/src/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(JPEG) # special case
 ## QJpegPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QJpegPlugin
+qt_internal_add_plugin(QJpegPlugin
     OUTPUT_NAME qjpeg
     TYPE imageformats
     SOURCES