Revert "fix cmake configuration"

This reverts commit cd828579c3ca2ad5895ab4d7733f8648254e860a.
This commit is contained in:
Andrei Yankovich 2024-12-21 19:36:15 +01:00
parent cd828579c3
commit c1c22a9fa2
3 changed files with 4 additions and 5 deletions

View File

@ -14,7 +14,6 @@ qt_add_executable(QMLFileDialog
qt_add_qml_module(QMLFileDialog
URI QMLFileDialog
VERSION 1.0
RESOURCE_PREFIX "/"
QML_FILES main.qml
)

View File

@ -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
)

View File

@ -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
)