From c1c22a9fa2582a091863b8840f62f93faad2eb5f Mon Sep 17 00:00:00 2001 From: EndrII <EndrIIMail@gmail.com> Date: Sat, 21 Dec 2024 19:36:15 +0100 Subject: [PATCH] Revert "fix cmake configuration" This reverts commit cd828579c3ca2ad5895ab4d7733f8648254e860a. --- testcases/QMLFileDialog/CMakeLists.txt | 1 - testcases/quicknanobrowser/CMakeLists.txt | 4 ++-- testcases/webui/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/testcases/QMLFileDialog/CMakeLists.txt b/testcases/QMLFileDialog/CMakeLists.txt index 805db19..30e6112 100644 --- a/testcases/QMLFileDialog/CMakeLists.txt +++ b/testcases/QMLFileDialog/CMakeLists.txt @@ -14,7 +14,6 @@ qt_add_executable(QMLFileDialog qt_add_qml_module(QMLFileDialog URI QMLFileDialog VERSION 1.0 - RESOURCE_PREFIX "/" QML_FILES main.qml ) diff --git a/testcases/quicknanobrowser/CMakeLists.txt b/testcases/quicknanobrowser/CMakeLists.txt index 013bb53..aefcae8 100644 --- a/testcases/quicknanobrowser/CMakeLists.txt +++ b/testcases/quicknanobrowser/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) set(CMAKE_AUTOMOC ON) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Qml Quick WebViewQuick) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Qml Quick WebEngineQuick) # Resources: file(GLOB_RECURSE SOURCE_QRC @@ -25,5 +25,5 @@ target_link_libraries(quicknanobrowser PUBLIC Qt::Gui Qt::Qml Qt::Quick - Qt::WebViewQuick + Qt::WebEngineQuick ) diff --git a/testcases/webui/CMakeLists.txt b/testcases/webui/CMakeLists.txt index dcdbd00..fc27a14 100644 --- a/testcases/webui/CMakeLists.txt +++ b/testcases/webui/CMakeLists.txt @@ -4,7 +4,7 @@ project(webui LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui WebView) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui WebEngineWidgets) # needed for test RPATH functions get_filename_component(QT_QT_ROOT "${Qt${QT_VERSION_MAJOR}Core_DIR}/../../.." ABSOLUTE) @@ -30,5 +30,5 @@ set_target_properties(webui PROPERTIES target_link_libraries(webui PUBLIC Qt::Core Qt::Gui - Qt::WebView + Qt::WebEngineWidgets )