QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-26 09:44:33 +00:00
Code Issues Projects Releases Wiki Activity

update web engine config
Some checks failed
buildbot/DocsGenerator Build finished.
Details
buildbot/AndroidBuilder_v8Qt6 Build finished.
Details
buildbot/LinuxCMakeBuilderQt6 Build finished.
Details

Browse Source
This commit is contained in:
Andrei Yankovich 2024-12-21 22:34:42 +01:00
parent 3f2b3cc2bf
commit c53f981a56
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -76,6 +76,9 @@ else()
endif() endif()
if (CQT_DEPLOYER_TESTS) if (CQT_DEPLOYER_TESTS)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS WebEngineQuick)
add_subdirectory(testcases) add_subdirectory(testcases)
add_subdirectory(tests) add_subdirectory(tests)
else() else()

4
testcases/CMakeLists.txt
View File

@ -19,10 +19,8 @@ if (NOT WIN32)
add_subdirectory(QMLFileDialog) add_subdirectory(QMLFileDialog)
add_subdirectory(virtualkeyboard) add_subdirectory(virtualkeyboard)
# this tests is not actual for the qt 6.8 and later. Use WebView. if (Qt${QT_VERSION_MAJOR}WebEngineQuick_FOUND)
if (QT_VERSION_MAJOR LESS_EQUAL 6 AND QT_VERSION_MINOR LESS_EQUAL 7)
add_subdirectory(quicknanobrowser) add_subdirectory(quicknanobrowser)
add_subdirectory(webui) add_subdirectory(webui)
endif() endif()
endif() endif()

4
tests/CMakeLists.txt
View File

@ -47,6 +47,10 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/modules"
add_definitions(-DQT_BASE_DIR="${QT_QT_ROOT}/") add_definitions(-DQT_BASE_DIR="${QT_QT_ROOT}/")
add_definitions(-DTEST_BIN_DIR="${CMAKE_CURRENT_LIST_DIR}/../testcases/bin/") add_definitions(-DTEST_BIN_DIR="${CMAKE_CURRENT_LIST_DIR}/../testcases/bin/")
if (Qt${QT_VERSION_MAJOR}WebEngineQuick_FOUND)
add_definitions(-DUSE_WEBENGINE)
endif()
add_executable(${CURRENT_PROJECT} ${SOURCE_CPP}) add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test Deploy) target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test Deploy)

7
tests/units/linux/webenginetest.cpp
View File

@ -8,7 +8,7 @@
#include "webenginetest.h" #include "webenginetest.h"
#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0) #ifdef USE_WEBENGINE
#include "modules.h" #include "modules.h"
#endif #endif
@ -20,8 +20,7 @@
void WebEngineTest::test() { void WebEngineTest::test() {
#ifdef Q_OS_UNIX #ifdef USE_WEBENGINE
#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
TestUtils utils; TestUtils utils;
QString bin = TestBinDir + "quicknanobrowser"; QString bin = TestBinDir + "quicknanobrowser";
@ -41,7 +40,5 @@ void WebEngineTest::test() {
runTestParams({"-bin", bin, "clear" , runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake}, &comapareTree); "-qmake", qmake}, &comapareTree);
#endif
#endif #endif
} }