[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [extra-cmake-modules] toolchain: Android: Properly offer a fallback to applications that don't have 
From:       Aleix Pol <null () kde ! org>
Date:       2018-09-27 12:54:55
Message-ID: E1g5Vol-0007d6-DM () code ! kde ! org
[Download RAW message or body]

Git commit 88da70365026ec218e03f6bdaf9803bddd21878c by Aleix Pol.
Committed on 27/09/2018 at 12:52.
Pushed by apol into branch 'master'.

Android: Properly offer a fallback to applications that don't have a manife=
st

The variable name was wrong, not much to see here.

M  +1    -1    toolchain/Android.cmake

https://commits.kde.org/extra-cmake-modules/88da70365026ec218e03f6bdaf9803b=
ddd21878c

diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake
index eeeea54..d40463c 100644
--- a/toolchain/Android.cmake
+++ b/toolchain/Android.cmake
@@ -207,7 +207,7 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET "cr=
eate-apk")
             message(FATAL_ERROR "Cannot find ${APK_DIR}/AndroidManifest.xm=
l according to ANDROID_APK_DIR. ${ANDROID_APK_DIR} ${exportedTarget}")
         elseif(NOT APK_DIR)
             get_filename_component(_qt5Core_install_prefix "${Qt5Core_DIR}=
/../../../" ABSOLUTE)
-            set(ANDROID_APK_DIR "${_qt5Core_install_prefix}/src/android/te=
mplates/")
+            set(APK_DIR "${_qt5Core_install_prefix}/src/android/templates/=
")
         endif()
 =

         ecm_androiddeployqt("${exportedTarget}" "${ECM_ADDITIONAL_FIND_ROO=
T_PATH}")
[prev in list] [next in list] [prev in thread] [next in thread]