Regenerate qtdeclarative

Change-Id: I48d7fd306f3d1b161a8e73029282ee591b1ef612
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>

15 files changed, 33 insertions, 66 deletions

diff --git a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
index 1a28e73cea..b75f143faa 100644
--- a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
@@ -19,14 +19,12 @@ qt_add_test(tst_qdebugmessageservice
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlDebugPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Network
-        Qt::QmlDebug
+        Qt::QmlDebugPrivate
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
index 89e7b098bd..4650f9074d 100644
--- a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
@@ -13,14 +13,12 @@ qt_add_test(tst_qpacketprotocol
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlDebugPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Network
-        Qt::QmlDebug
+        Qt::QmlDebugPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
index 578bc9bd21..e727640a9d 100644
--- a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
@@ -17,15 +17,12 @@ qt_add_test(tst_qqmldebugclient
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlDebugPrivate
         Qt::QmlPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::QmlDebug
 )
 
 ## Scopes:
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
index c90cc0e9de..fbbaa3a0f4 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
@@ -13,14 +13,12 @@ qt_add_test(tst_qqmldebuggingenabler
     INCLUDE_DIRECTORIES
         ../../../../shared
         ../../shared
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlDebugPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Qml
-        Qt::QmlDebug
+        Qt::QmlDebugPrivate
 )
 
 #### Keys ignored in scope 1:.:.:qqmldebuggingenabler.pro:<TRUE>:
diff --git a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
index 4f9777eeba..ba2f013b05 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
@@ -19,13 +19,11 @@ qt_add_test(tst_qqmldebugjs
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared ../shared
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlDebugPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::QmlDebug
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
index 791ea18adb..7712af32db 100644
--- a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
@@ -16,15 +16,12 @@ qt_add_test(tst_qqmldebuglocal
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlDebugPrivate
         Qt::QmlPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::QmlDebug
 )
 
 ## Scopes:
diff --git a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
index 9b369053cc..c4dcf92313 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
@@ -22,15 +22,12 @@ qt_add_test(tst_qqmldebugservice
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlDebugPrivate
         Qt::QmlPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::QmlDebug
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
index a0f76b270a..177215080b 100644
--- a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
@@ -19,13 +19,11 @@ qt_add_test(tst_qqmlenginecontrol
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlDebugPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::QmlDebug
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
index b8c377a268..9b81b04568 100644
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
@@ -19,13 +19,11 @@ qt_add_test(tst_qqmlenginedebuginspectorintegration
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlDebugPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::QmlDebug
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
index 6e54b5c7f5..758d63c6e9 100644
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
@@ -15,13 +15,10 @@ qt_add_test(tst_qqmlenginedebugservice
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
-        Qt::QmlDebugPrivate
-        Qt::QmlPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
-        Qt::Qml
-        Qt::QmlDebug
+        Qt::QmlDebugPrivate
+        Qt::QmlPrivate
         Qt::Quick
 )
 
diff --git a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
index 822f59a2cb..5b5dc7cd52 100644
--- a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
@@ -19,13 +19,11 @@ qt_add_test(tst_qqmlinspector
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlDebugPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::QmlDebug
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
index c818c158dc..bbff6a73c5 100644
--- a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
@@ -9,11 +9,10 @@ qt_add_test(tst_qqmlnativeconnector
         tst_qqmlnativeconnector.cpp
     DEFINES
         QT_QML_DEBUG
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Qml
 )
 
diff --git a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
index 1d31348b6d..32013a9c32 100644
--- a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
@@ -24,12 +24,10 @@ qt_add_test(tst_qqmlpreview
         ../../../../../src/plugins/qmltooling/qmldbg_preview
         ../../../shared
         ../shared
-    LIBRARIES
-        Qt::QmlDebugPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Qml
-        Qt::QmlDebug
+        Qt::QmlDebugPrivate
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
index c1c588b798..0972273b03 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
@@ -19,12 +19,10 @@ qt_add_test(tst_qqmlprofilerservice
     INCLUDE_DIRECTORIES
         ../../../shared
         ../shared
-    LIBRARIES
-        Qt::GuiPrivate
-        Qt::QmlDebugPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
-        Qt::QmlDebug
+        Qt::GuiPrivate
+        Qt::QmlDebugPrivate
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
index 61ba310c9e..8d8aeb396b 100644
--- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
@@ -12,14 +12,12 @@ qt_add_test(tst_qv4debugger
         tst_qv4debugger.cpp
     INCLUDE_DIRECTORIES
         ../../../../../src/plugins/qmltooling/qmldbg_debugger
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Network
-        Qt::Qml
+        Qt::QmlPrivate
 )
 
 ## Scopes: