diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26ebe79..c2dcd2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(META_APP_DESCRIPTION
     "Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models")
 set(META_VERSION_MAJOR 6)
 set(META_VERSION_MINOR 0)
-set(META_VERSION_PATCH 4)
+set(META_VERSION_PATCH 5)
 set(META_APP_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH})
 
 project(${META_PROJECT_NAME})
diff --git a/cmake/modules/AndroidApk.cmake b/cmake/modules/AndroidApk.cmake
index 4e35555..6b73d12 100644
--- a/cmake/modules/AndroidApk.cmake
+++ b/cmake/modules/AndroidApk.cmake
@@ -221,18 +221,18 @@ compose_dirs_for_android_apk(
     POSSIBLE_DIRS
     "${QT_INSTALL_IMPORTS}"
     "${QT_INSTALL_QML}"
-    "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qt/imports"
-    "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/imports"
-    "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qt/qml"
-    "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qml")
+    "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/qt/imports"
+    "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/imports"
+    "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/qt/qml"
+    "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/qml")
 if (NOT ANDROID_APK_QML_IMPORT_DIRS)
     message(WARNING "Unable to find QML import directories for making the APK.")
 endif ()
 
 # pick extra plugins from install prefix
 compose_dirs_for_android_apk(OUTPUT_VARIABLE ANDROID_APK_EXTRA_PLUGIN_DIRS POSSIBLE_DIRS "${QT_INSTALL_PLUGINS}"
-                             "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qt/plugins"
-                             "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/plugins")
+                             "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/qt/plugins"
+                             "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/plugins")
 if (NOT ANDROID_APK_EXTRA_PLUGIN_DIRS)
     message(WARNING "Unable to find extra plugin directories for making the APK.")
 endif ()
diff --git a/cmake/modules/QtConfig.cmake b/cmake/modules/QtConfig.cmake
index d290034..711f9b2 100644
--- a/cmake/modules/QtConfig.cmake
+++ b/cmake/modules/QtConfig.cmake
@@ -225,11 +225,11 @@ if (QT_INSTALL_TRANSLATIONS)
     list(APPEND QT_TRANSLATION_SEARCH_PATHS "${QT_INSTALL_TRANSLATIONS}")
 endif ()
 if (CMAKE_FIND_ROOT_PATH)
-    list(APPEND QT_TRANSLATION_SEARCH_PATHS "${CMAKE_FIND_ROOT_PATH}/share/qt/translations"
-                "${CMAKE_FIND_ROOT_PATH}/share/qt5/translations")
+    list(APPEND QT_TRANSLATION_SEARCH_PATHS "${CMAKE_FIND_ROOT_PATH}/${CMAKE_INSTALL_DATAROOTDIR}/qt/translations"
+                "${CMAKE_FIND_ROOT_PATH}/${CMAKE_INSTALL_DATAROOTDIR}/qt5/translations")
 endif ()
-list(APPEND QT_TRANSLATION_SEARCH_PATHS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/qt/translations"
-            "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/qt5/translations" "/usr/${CMAKE_INSTALL_DATAROOTDIR}/qt/translations"
+list(APPEND QT_TRANSLATION_SEARCH_PATHS "${CMAKE_INSTALL_FULL_DATAROOTDIR}/qt/translations"
+            "${CMAKE_INSTALL_FULL_DATAROOTDIR}/qt5/translations" "/usr/${CMAKE_INSTALL_DATAROOTDIR}/qt/translations"
             "/usr/${CMAKE_INSTALL_DATAROOTDIR}/qt5/translations")
 list(REMOVE_DUPLICATES QT_TRANSLATION_SEARCH_PATHS)
 foreach (QT_TRANSLATION_PATH ${QT_TRANSLATION_SEARCH_PATHS})
@@ -358,11 +358,11 @@ if (REQUIRED_ICONS)
         set(ICON_THEME_FILES)
         set(ICON_SEARCH_PATHS)
         if (CMAKE_FIND_ROOT_PATH)
-            # find icons from the regular prefix when cross-compiling
-            list(APPEND ICON_SEARCH_PATHS "${CMAKE_FIND_ROOT_PATH}/share/icons")
+            list(APPEND ICON_SEARCH_PATHS "${CMAKE_FIND_ROOT_PATH}/${CMAKE_INSTALL_DATAROOTDIR}/icons")
         endif ()
-        list(APPEND ICON_SEARCH_PATHS "${CMAKE_INSTALL_PREFIX}/share/icons")
-        list(APPEND ICON_SEARCH_PATHS "/usr/share/icons")
+        list(APPEND ICON_SEARCH_PATHS "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons")
+        list(APPEND ICON_SEARCH_PATHS "/usr/${CMAKE_INSTALL_DATAROOTDIR}/icons") # find icons from regular prefix when cross-compiling
+        list(REMOVE_DUPLICATES ICON_SEARCH_PATHS)
         set(BUILTIN_ICONS_DIR "${CMAKE_CURRENT_BINARY_DIR}/icons")
         set(DEFAULT_THEME_INDEX_FILE "${BUILTIN_ICONS_DIR}/default/index.theme")
         file(REMOVE_RECURSE "${BUILTIN_ICONS_DIR}")