From 59121d29808feeb8ee4c052ba554915d5b875c9b Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kde.org>
Date: Tue, 11 Feb 2020 09:14:25 +0200
Subject: Fix ANDROID_XXXX replace qmake function call

The second parameter of replace is a regex, therefore trying to replace strings like
"plugins/sensors/libplugins_sensors_qtsensors_android.so" will result to super strange
results.

Fixes: QTBUG-81974
Change-Id: I887e70f4fd8fa2af482a60f63af371f954b56ce1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qt_android_deps.prf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mkspecs/features/qt_android_deps.prf')

diff --git a/mkspecs/features/qt_android_deps.prf b/mkspecs/features/qt_android_deps.prf
index e50c24b966..354e40ed23 100644
--- a/mkspecs/features/qt_android_deps.prf
+++ b/mkspecs/features/qt_android_deps.prf
@@ -46,8 +46,8 @@ build_pass:!isEmpty(QT_ARCH): {
             EXTENDS = $$section(LIB_FILE, ":", 1, 1)
             !isEmpty(EXTENDS): EXTENDS = "extends=\"$$EXTENDS\""
             LIB_FILE = $$section(LIB_FILE, ":", 0, 0)
-            LIB_FILE = $$replace(LIB_FILE,".so", "_$${QT_ARCH}.so")
-            !isEmpty(EXTENDS): EXTENDS = $$replace(EXTENDS,".so", "_$${QT_ARCH}.so")
+            LIB_FILE = $$replace(LIB_FILE,"\.so", "_$${QT_ARCH}.so")
+            !isEmpty(EXTENDS): EXTENDS = $$replace(EXTENDS,"\.so", "_$${QT_ARCH}.so")
             FILE_CONTENT += "<lib file=\"$$LIB_FILE\" $$EXTENDS />"
         }
     }
@@ -56,14 +56,14 @@ build_pass:!isEmpty(QT_ARCH): {
         for(REPLACEMENT, ANDROID_LIB_DEPENDENCY_REPLACEMENTS) {
             REPLACEMENT_FILE = $$section(REPLACEMENT, ":", 0, 0)
             LIB_FILE = $$section(REPLACEMENT, ":", 1, 1)
-            REPLACEMENT_FILE = $$replace(REPLACEMENT_FILE,".so", "_$${QT_ARCH}.so")
+            REPLACEMENT_FILE = $$replace(REPLACEMENT_FILE,"\.so", "_$${QT_ARCH}.so")
             FILE_CONTENT += "<lib file=\"$$LIB_FILE\" replaces=\"$$REPLACEMENT_FILE\" />"
         }
     }
 
     !isEmpty(ANDROID_BUNDLED_FILES) {
         for (BUNDLED_FILE, ANDROID_BUNDLED_FILES) {
-            BUNDLED_FILE = $$replace(BUNDLED_FILE,".so", "_$${QT_ARCH}.so")
+            BUNDLED_FILE = $$replace(BUNDLED_FILE,"\.so", "_$${QT_ARCH}.so")
             FILE_CONTENT += "<bundled file=\"$$BUNDLED_FILE\" />"
         }
     }
-- 
cgit v1.2.3