diff options
| author | Sakaria Pouke <sakaria.pouke@qt.io> | 2024-01-26 10:40:07 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-29 06:31:07 +0000 |
| commit | 9b754f82a36ba04e4fe3b0919621a298b37ca24f (patch) | |
| tree | ea0bdd23fb906750d92f5ecae90f6e3df0163dcd | |
| parent | 6fbb0d172bb7e235ca9e21fa706faaa955c144dc (diff) | |
Check for android_openssl in stocQt
Fixes: QTBUG-121524
Pick-to: 6.6 6.6.2
Change-Id: Ia48eedd665dd57d45b0e515ec18ecb2f95d951ef
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 41a14b96794e20ba925f1e2cb77c2c8e1db2742a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/demos/stocqt/CMakeLists.txt | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/examples/demos/stocqt/CMakeLists.txt b/examples/demos/stocqt/CMakeLists.txt index 848c5a3f3..dda3fd4d3 100644 --- a/examples/demos/stocqt/CMakeLists.txt +++ b/examples/demos/stocqt/CMakeLists.txt @@ -14,29 +14,34 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/stocqt") -if (ANDROID AND QT_ALLOW_DOWNLOAD) - include(FetchContent) - FetchContent_Declare( - android_openssl - DOWNLOAD_EXTRACT_TIMESTAMP true - URL https://github.com/KDAB/android_openssl/archive/refs/heads/master.zip - ) - FetchContent_MakeAvailable(android_openssl) - include(${android_openssl_SOURCE_DIR}/android_openssl.cmake) -endif() - -find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS Core Gui Qml Quick Graphs) - qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(appStocQt src/main.cpp ) +option(QT_ANDROID_FETCH_OPENSSL "Fetch Android OpenSSL support for Qt from gitlab" OFF) + if (ANDROID) - add_android_openssl_libraries(appStocQt) + if (QT_ANDROID_FETCH_OPENSSL) + include(FetchContent) + FetchContent_Declare( + android_openssl + DOWNLOAD_EXTRACT_TIMESTAMP true + URL https://github.com/KDAB/android_openssl/archive/refs/heads/master.zip + ) + + FetchContent_MakeAvailable(android_openssl) + include(${android_openssl_SOURCE_DIR}/android_openssl.cmake) + add_android_openssl_libraries(appStocQt) + else() + message(WARNING "android_openssl.cmake not found. Live data will not be available. + Consider setting QT_ANDROID_FETCH_OPENSSL=TRUE") + endif() endif() +find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS Core Gui Qml Quick Graphs) + qt_add_qml_module(appStocQt URI StocQt NO_RESOURCE_TARGET_PATH |