qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 4c31a78516)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne 2021-12-03 16:22:29 +01:00 committed by Qt Cherry-pick Bot
parent 514165e843
commit 76ac6443b6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/corelib/platform/androidnotifier/CMakeLists.txt
View File

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