diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-12-03 16:22:29 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-06 15:40:10 +0000 |
| commit | 76ac6443b6d305d1bf5fe759b376408a4de3ad96 (patch) | |
| tree | 79e10bfaad38c8319f59dc78a1303e714b3ab0eb /examples/corelib | |
| parent | 514165e84372c6693cbd338962613248ef6a86f9 (diff) | |
Do not support Qt5 build in androidnotifier example
We can expect that users use Qt 6 to try out Qt 6 examples.
Change-Id: Ifa7bd9471a712fa1d63107b7ff2d392b7aefdcfe
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4c31a7851604a1edb846d1bec8ddddb21457150b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/corelib')
| -rw-r--r-- | examples/corelib/platform/androidnotifier/CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/examples/corelib/platform/androidnotifier/CMakeLists.txt b/examples/corelib/platform/androidnotifier/CMakeLists.txt index fa5a7ce023..54aa5043c0 100644 --- a/examples/corelib/platform/androidnotifier/CMakeLists.txt +++ b/examples/corelib/platform/androidnotifier/CMakeLists.txt @@ -11,8 +11,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED) +find_package(Qt6 COMPONENTS Widgets REQUIRED) set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/platform/androidnotifier") @@ -26,14 +25,12 @@ if(ANDROID) qt_add_executable(androidnotifier MANUAL_FINALIZATION ${PROJECT_SOURCES}) - target_link_libraries(androidnotifier PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) + target_link_libraries(androidnotifier PRIVATE Qt6::Widgets) set_property(TARGET androidnotifier APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android) - if(QT_VERSION_MAJOR EQUAL 6) - qt_finalize_executable(androidnotifier) - endif() + qt_finalize_executable(androidnotifier) set(qml_resource_files "images/happy.png" |