From fc18c6b42fab945b7bca044511a23eab7726e8fa Mon Sep 17 00:00:00 2001 From: Balazs Egedi Date: Wed, 11 Aug 2021 15:11:26 +0200 Subject: Remove import versions from Quick auto tests Task-number: QTBUG-93666 Pick-to: 6.2 Change-Id: I502c240ba541c1c13505f0e78a4098e2aa229af8 Reviewed-by: Allan Sandfeld Jensen --- tests/auto/quick/qmltests/data/tst_action.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_activeFocusOnPress.qml | 4 ++-- tests/auto/quick/qmltests/data/tst_audioMuted.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_certificateError.qml | 8 ++++---- tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_download.qml | 10 +++++----- tests/auto/quick/qmltests/data/tst_filePicker.qml | 10 +++++----- tests/auto/quick/qmltests/data/tst_findText.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_focusOnNavigation.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_fullScreenRequest.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_geopermission.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_getUserMedia.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_inputMethod.qml | 2 +- tests/auto/quick/qmltests/data/tst_keyboardEvents.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_linkHovered.qml | 2 +- tests/auto/quick/qmltests/data/tst_loadFail.qml | 8 ++++---- tests/auto/quick/qmltests/data/tst_loadHtml.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_loadProgress.qml | 8 ++++---- tests/auto/quick/qmltests/data/tst_loadRecursionCrash.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_loadUrl.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_mouseClick.qml | 2 +- tests/auto/quick/qmltests/data/tst_mouseMove.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_navigationHistory.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_navigationRequested.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_newViewRequest.qml | 8 ++++---- tests/auto/quick/qmltests/data/tst_notification.qml | 8 ++++---- tests/auto/quick/qmltests/data/tst_properties.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_runJavaScript.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_scrollPosition.qml | 8 ++++---- tests/auto/quick/qmltests/data/tst_settings.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_titleChanged.qml | 6 +++--- .../quick/qmltests/data/tst_unhandledKeyEventPropagation.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_userScripts.qml | 6 +++--- tests/auto/quick/qmltests/data/tst_webchannel.qml | 8 ++++---- .../qmltests/mock-delegates/TestParams/FilePickerParams.qml | 2 +- .../qmltests/mock-delegates/TestParams/JSDialogParams.qml | 2 +- 37 files changed, 111 insertions(+), 111 deletions(-) (limited to 'tests/auto/quick/qmltests') diff --git a/tests/auto/quick/qmltests/data/tst_action.qml b/tests/auto/quick/qmltests/data/tst_action.qml index 91f260e0e..554f0929a 100644 --- a/tests/auto/quick/qmltests/data/tst_action.qml +++ b/tests/auto/quick/qmltests/data/tst_action.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 -import QtTest 1.0 -import QtWebEngine 1.8 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_activeFocusOnPress.qml b/tests/auto/quick/qmltests/data/tst_activeFocusOnPress.qml index 83a2dc8c9..d423bdd12 100644 --- a/tests/auto/quick/qmltests/data/tst_activeFocusOnPress.qml +++ b/tests/auto/quick/qmltests/data/tst_activeFocusOnPress.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtTest 1.0 +import QtQuick +import QtTest Item { id: root diff --git a/tests/auto/quick/qmltests/data/tst_audioMuted.qml b/tests/auto/quick/qmltests/data/tst_audioMuted.qml index d0d9e35c3..c6a882f5a 100644 --- a/tests/auto/quick/qmltests/data/tst_audioMuted.qml +++ b/tests/auto/quick/qmltests/data/tst_audioMuted.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.4 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: view diff --git a/tests/auto/quick/qmltests/data/tst_certificateError.qml b/tests/auto/quick/qmltests/data/tst_certificateError.qml index b254bb621..07f38e776 100644 --- a/tests/auto/quick/qmltests/data/tst_certificateError.qml +++ b/tests/auto/quick/qmltests/data/tst_certificateError.qml @@ -26,11 +26,11 @@ ** ****************************************************************************/ -import QtQuick 2.2 -import QtTest 1.0 -import QtWebEngine 1.9 +import QtQuick +import QtTest +import QtWebEngine -import Test.Shared 1.0 as Shared +import Test.Shared as Shared TestWebEngineView { id: view; width: 320; height: 320 diff --git a/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml b/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml index 780294348..cac56d88f 100644 --- a/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml +++ b/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_download.qml b/tests/auto/quick/qmltests/data/tst_download.qml index bac4d5cc5..93c430a51 100644 --- a/tests/auto/quick/qmltests/data/tst_download.qml +++ b/tests/auto/quick/qmltests/data/tst_download.qml @@ -26,11 +26,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.10 -import Qt.labs.platform 1.0 -import Test.util 1.0 +import QtQuick +import QtTest +import QtWebEngine +import Qt.labs.platform +import Test.util TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_filePicker.qml b/tests/auto/quick/qmltests/data/tst_filePicker.qml index 5b963c7bf..475718c31 100644 --- a/tests/auto/quick/qmltests/data/tst_filePicker.qml +++ b/tests/auto/quick/qmltests/data/tst_filePicker.qml @@ -26,11 +26,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 -import "../../qmltests/data" 1.0 -import "../mock-delegates/TestParams" 1.0 +import QtQuick +import QtTest +import QtWebEngine +import "../../qmltests/data" +import "../mock-delegates/TestParams" TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_findText.qml b/tests/auto/quick/qmltests/data/tst_findText.qml index 0b4a8d459..874f6184b 100644 --- a/tests/auto/quick/qmltests/data/tst_findText.qml +++ b/tests/auto/quick/qmltests/data/tst_findText.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_focusOnNavigation.qml b/tests/auto/quick/qmltests/data/tst_focusOnNavigation.qml index b2b7374f6..7ed684f79 100644 --- a/tests/auto/quick/qmltests/data/tst_focusOnNavigation.qml +++ b/tests/auto/quick/qmltests/data/tst_focusOnNavigation.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtTest 1.0 -import QtWebEngine 1.4 +import QtQuick +import QtTest +import QtWebEngine Item { id: container diff --git a/tests/auto/quick/qmltests/data/tst_fullScreenRequest.qml b/tests/auto/quick/qmltests/data/tst_fullScreenRequest.qml index 2d9247b26..c7996a11e 100644 --- a/tests/auto/quick/qmltests/data/tst_fullScreenRequest.qml +++ b/tests/auto/quick/qmltests/data/tst_fullScreenRequest.qml @@ -1,6 +1,6 @@ -import QtQuick 2.2 -import QtTest 1.0 -import QtWebEngine 1.9 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: view diff --git a/tests/auto/quick/qmltests/data/tst_geopermission.qml b/tests/auto/quick/qmltests/data/tst_geopermission.qml index 9f613abf3..87272dc45 100644 --- a/tests/auto/quick/qmltests/data/tst_geopermission.qml +++ b/tests/auto/quick/qmltests/data/tst_geopermission.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 -import QtTest 1.0 -import QtWebEngine 1.1 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml index 4cfbbf090..ac9e0f7f2 100644 --- a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml +++ b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 -import QtTest 1.0 -import QtWebEngine 1.6 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_inputMethod.qml b/tests/auto/quick/qmltests/data/tst_inputMethod.qml index 16b7a06d5..0b7135bbf 100644 --- a/tests/auto/quick/qmltests/data/tst_inputMethod.qml +++ b/tests/auto/quick/qmltests/data/tst_inputMethod.qml @@ -30,7 +30,7 @@ import QtQuick import QtTest import QtWebEngine import Test.util -import "../../qmltests/data" 1.0 +import "../../qmltests/data" TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml b/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml index 136863c4c..7c594d921 100644 --- a/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml +++ b/tests/auto/quick/qmltests/data/tst_keyboardEvents.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.4 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml index e0a8c0a41..f37cdf4b6 100644 --- a/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml +++ b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_linkHovered.qml b/tests/auto/quick/qmltests/data/tst_linkHovered.qml index d21d74434..a1343cbed 100644 --- a/tests/auto/quick/qmltests/data/tst_linkHovered.qml +++ b/tests/auto/quick/qmltests/data/tst_linkHovered.qml @@ -29,7 +29,7 @@ import QtQuick import QtTest import QtWebEngine -import "../../qmltests/data" 1.0 +import "../../qmltests/data" TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_loadFail.qml b/tests/auto/quick/qmltests/data/tst_loadFail.qml index 58d6b9e3c..73a3833e0 100644 --- a/tests/auto/quick/qmltests/data/tst_loadFail.qml +++ b/tests/auto/quick/qmltests/data/tst_loadFail.qml @@ -26,10 +26,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 -import "../../qmltests/data" 1.0 +import QtQuick +import QtTest +import QtWebEngine +import "../../qmltests/data" TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_loadHtml.qml b/tests/auto/quick/qmltests/data/tst_loadHtml.qml index 6ed9a4317..c4ed9ed3d 100644 --- a/tests/auto/quick/qmltests/data/tst_loadHtml.qml +++ b/tests/auto/quick/qmltests/data/tst_loadHtml.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_loadProgress.qml b/tests/auto/quick/qmltests/data/tst_loadProgress.qml index 7bfe1d9e9..e4aa2d882 100644 --- a/tests/auto/quick/qmltests/data/tst_loadProgress.qml +++ b/tests/auto/quick/qmltests/data/tst_loadProgress.qml @@ -26,11 +26,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine -import Test.Shared 1.0 as Shared +import Test.Shared as Shared TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_loadRecursionCrash.qml b/tests/auto/quick/qmltests/data/tst_loadRecursionCrash.qml index 81a0f0904..9d8de0a5a 100644 --- a/tests/auto/quick/qmltests/data/tst_loadRecursionCrash.qml +++ b/tests/auto/quick/qmltests/data/tst_loadRecursionCrash.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.3 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine Item { width: 300 diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml index 3a2341fc2..c331fab6b 100644 --- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml +++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_mouseClick.qml b/tests/auto/quick/qmltests/data/tst_mouseClick.qml index 647c84573..d75298a68 100644 --- a/tests/auto/quick/qmltests/data/tst_mouseClick.qml +++ b/tests/auto/quick/qmltests/data/tst_mouseClick.qml @@ -30,7 +30,7 @@ import QtQuick import QtTest import QtWebEngine import Test.util -import "../../qmltests/data" 1.0 +import "../../qmltests/data" TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_mouseMove.qml b/tests/auto/quick/qmltests/data/tst_mouseMove.qml index adfa3941c..6afab7aae 100644 --- a/tests/auto/quick/qmltests/data/tst_mouseMove.qml +++ b/tests/auto/quick/qmltests/data/tst_mouseMove.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.4 +import QtQuick +import QtTest +import QtWebEngine Rectangle { id: root diff --git a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml index d5073bef1..c7edb05ba 100644 --- a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml +++ b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_navigationRequested.qml b/tests/auto/quick/qmltests/data/tst_navigationRequested.qml index 11ea69e11..b3e247c44 100644 --- a/tests/auto/quick/qmltests/data/tst_navigationRequested.qml +++ b/tests/auto/quick/qmltests/data/tst_navigationRequested.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml index fb99e9cee..11a3645b6 100644 --- a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml +++ b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.5 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView @@ -60,7 +60,7 @@ TestWebEngineView { }; dialog = Qt.createQmlObject( - "import QtQuick.Window 2.0\n" + + "import QtQuick.Window\n" + "Window {\n" + " width: 100; height: 100\n" + " visible: true; flags: Qt.Dialog\n" + diff --git a/tests/auto/quick/qmltests/data/tst_notification.qml b/tests/auto/quick/qmltests/data/tst_notification.qml index 6f66256f2..802c75f7c 100644 --- a/tests/auto/quick/qmltests/data/tst_notification.qml +++ b/tests/auto/quick/qmltests/data/tst_notification.qml @@ -26,10 +26,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 -import QtTest 1.0 -import QtWebEngine 1.9 -import Test.Shared 1.0 as Shared +import QtQuick +import QtTest +import QtWebEngine +import Test.Shared as Shared TestWebEngineView { id: view diff --git a/tests/auto/quick/qmltests/data/tst_properties.qml b/tests/auto/quick/qmltests/data/tst_properties.qml index 89f8af9b8..7ae218977 100644 --- a/tests/auto/quick/qmltests/data/tst_properties.qml +++ b/tests/auto/quick/qmltests/data/tst_properties.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml index beeebc049..949e50bb7 100644 --- a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml +++ b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_scrollPosition.qml b/tests/auto/quick/qmltests/data/tst_scrollPosition.qml index 24b352dde..22fa92b85 100644 --- a/tests/auto/quick/qmltests/data/tst_scrollPosition.qml +++ b/tests/auto/quick/qmltests/data/tst_scrollPosition.qml @@ -26,10 +26,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 -import QtQuick.Window 2.0 -import QtTest 1.0 -import QtWebEngine 1.3 +import QtQuick +import QtQuick.Window +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_settings.qml b/tests/auto/quick/qmltests/data/tst_settings.qml index b286a1dae..07ce77a04 100644 --- a/tests/auto/quick/qmltests/data/tst_settings.qml +++ b/tests/auto/quick/qmltests/data/tst_settings.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_titleChanged.qml b/tests/auto/quick/qmltests/data/tst_titleChanged.qml index 7dda5ce33..d73664b02 100644 --- a/tests/auto/quick/qmltests/data/tst_titleChanged.qml +++ b/tests/auto/quick/qmltests/data/tst_titleChanged.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine TestWebEngineView { id: webEngineView diff --git a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml index 5e163fc64..d1738852d 100644 --- a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml +++ b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine Item { id: parentItem diff --git a/tests/auto/quick/qmltests/data/tst_userScripts.qml b/tests/auto/quick/qmltests/data/tst_userScripts.qml index 4d0bd28bf..82aae32a8 100644 --- a/tests/auto/quick/qmltests/data/tst_userScripts.qml +++ b/tests/auto/quick/qmltests/data/tst_userScripts.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine Item { diff --git a/tests/auto/quick/qmltests/data/tst_webchannel.qml b/tests/auto/quick/qmltests/data/tst_webchannel.qml index 3ca3ccce1..70edc1bcd 100644 --- a/tests/auto/quick/qmltests/data/tst_webchannel.qml +++ b/tests/auto/quick/qmltests/data/tst_webchannel.qml @@ -25,11 +25,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.2 +import QtQuick +import QtTest +import QtWebEngine -import QtWebChannel 1.0 +import QtWebChannel Item { id: test diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml index 02b0da1d4..48f94df60 100644 --- a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml +++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml @@ -27,7 +27,7 @@ ****************************************************************************/ pragma Singleton -import QtQuick 2.0 +import QtQuick QtObject { property var selectedFilesUrl: []; diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml b/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml index 70696803c..b24214a2e 100644 --- a/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml +++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/JSDialogParams.qml @@ -26,7 +26,7 @@ ** ****************************************************************************/ pragma Singleton -import QtQml 2.0 +import QtQml QtObject { property string dialogMessage: ""; -- cgit v1.2.3