Skip to content

Add Qt6 android support and QtQuick client example#196

Merged
frankosterfeld merged 10 commits into
frankosterfeld:masterfrom
freedbrt:master
Sep 28, 2022
Merged

Add Qt6 android support and QtQuick client example#196
frankosterfeld merged 10 commits into
frankosterfeld:masterfrom
freedbrt:master

Conversation

@freedbrt

Copy link
Copy Markdown
Contributor

No description provided.

Comment thread TestAppExample/.gitignore
Comment thread TestAppExample/keychainclass.cpp Outdated

@frankosterfeld frankosterfeld left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Android/Qt6 support patch looks good!

Comment thread TestAppExample/TestAppExample.pro Outdated
@freedbrt

freedbrt commented Oct 5, 2021

Copy link
Copy Markdown
Contributor Author

Ok, done

@PeterPetrik

Copy link
Copy Markdown

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?

@PeterPetrik

Copy link
Copy Markdown

This needs a change,

find_package(Qt6 COMPONENTS AndroidExtras REQUIRED)
should be removed, there is no Qt6AndroidExtras package at all.

@PeterPetrik

Copy link
Copy Markdown

@frankosterfeld shall we fix this PR, or shall I create a simpler PR with just a required changes?

@frankosterfeld

frankosterfeld commented Sep 14, 2022

Copy link
Copy Markdown
Owner

@PeterPetrik I'd say fix up this PR. I hope i get to a new release when back from vacation.

@PeterPetrik

Copy link
Copy Markdown

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

@freedbrt

Copy link
Copy Markdown
Contributor Author

@PeterPetrik i can modify, if it needed

@PeterPetrik

Copy link
Copy Markdown

@freedbrt thanks!

@frankosterfeld frankosterfeld merged commit 8506d57 into frankosterfeld:master Sep 28, 2022
@frankosterfeld

Copy link
Copy Markdown
Owner

Thanks!

@michaelk83

Copy link
Copy Markdown

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...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants