qtkeychain
qtkeychain copied to clipboard
Add Qt6 android support and QtQuick client example
Ok, done
We are migrating merginmaps.com to Qt6, this patch is critical so we can build Android. Would it be possible to merge it and create new qtkeychain release?
This needs a change, https://github.com/frankosterfeld/qtkeychain/blob/f197cdb935b0cfd9881fdc6860874cb8379d1238/CMakeLists.txt#L98 should be removed, there is no Qt6AndroidExtras package at all.
@frankosterfeld shall we fix this PR, or shall I create a simpler PR with just a required changes?
@PeterPetrik I'd say fix up this PR. I hope i get to a new release when back from vacation.
@frankosterfeld cannot modify his branch, maybe the stuff can be removed after mergin it?
here is the patch
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,11 +91,11 @@ else()
find_package(Qt6 COMPONENTS Core REQUIRED)
set(QTKEYCHAIN_VERSION_INFIX 6)
- if(ANDROID)
- find_package(Qt6 COMPONENTS AndroidExtras REQUIRED)
- include_directories(${Qt6AndroidExtras_INCLUDE_DIRS})
- set(QTANDROIDEXTRAS_LIBRARIES ${Qt6AndroidExtras_LIBRARIES})
- endif()
+ # if(ANDROID)
+ # find_package(Qt6 COMPONENTS AndroidExtras REQUIRED)
+ # include_directories(${Qt6AndroidExtras_INCLUDE_DIRS})
+ # set(QTANDROIDEXTRAS_LIBRARIES ${Qt6AndroidExtras_LIBRARIES})
+ # endif()
if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
find_package(Qt6 COMPONENTS DBus REQUIRED)
@PeterPetrik i can modify, if it needed
@freedbrt thanks!
Thanks!
I hope i get to a new release when back from vacation.
@frankosterfeld , if you're preparing a new release, would it be possible to also include #75 ? It needs an update, but it's a small change, so shouldn't be too complicated...