From f8516c1b42c6b13f7fc97abb6c3076ed698716ee Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 2 Aug 2022 18:06:54 +0200 Subject: [PATCH] Port remaining QQC1 uses --- CMakeLists.txt | 2 +- tests/inputmethodstest.qml | 2 +- tests/unmapdestroytest.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba2387bf08..294369e484 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -352,7 +352,7 @@ set(HAVE_ACCESSIBILITY ${QAccessibilityClient_FOUND}) include(ECMFindQmlModule) ecm_find_qmlmodule(QtQuick 2.3) -ecm_find_qmlmodule(QtQuick.Controls 1.2) +ecm_find_qmlmodule(QtQuick.Controls 2.15) ecm_find_qmlmodule(QtQuick.Layouts 1.3) ecm_find_qmlmodule(QtQuick.Window 2.1) ecm_find_qmlmodule(QtMultimedia 5.0) diff --git a/tests/inputmethodstest.qml b/tests/inputmethodstest.qml index 155eba9e68..83bcd16722 100644 --- a/tests/inputmethodstest.qml +++ b/tests/inputmethodstest.qml @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick.Controls 1.4 +import QtQuick.Controls 2.15 import QtQuick.Layouts 1.2 GridLayout { diff --git a/tests/unmapdestroytest.qml b/tests/unmapdestroytest.qml index 95af4076e8..82b0ff0eb0 100644 --- a/tests/unmapdestroytest.qml +++ b/tests/unmapdestroytest.qml @@ -6,7 +6,7 @@ import QtQuick 2.1 import QtQuick.Window 2.1 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 2.15 /* * Small test application to test the difference between unmap and destroy.