From b6afde4dd066651aaaa409adb0409420c62a47ff Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 28 Jan 2019 08:09:11 +0100
Subject: Fix corewlan configure test

Configure is unable to find header files that are located in
frameworks. Work around that by specifying "include" on "test" level
instead of "headers" on "corewlan" level.

This amends commit 10adbc4f0f.

Change-Id: I0650585eb9a4e881dc2e3733d8db40c6e50cf1f3
Fixes: QTBUG-72964
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/network/configure.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/network/configure.json b/src/network/configure.json
index 10c4f87a2e..f3e18662aa 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -28,9 +28,9 @@
             "export": "",
             "test": {
                 "lang": "objc++",
+                "include": [ "CoreWLAN/CoreWLAN.h", "CoreWLAN/CWInterface.h" ],
                 "main": "[CWInterface interfaceWithName:@\"en2\"];"
             },
-            "headers": [ "CoreWLAN/CoreWLAN.h", "CoreWLAN/CWInterface.h" ],
             "sources": [
                 "-framework CoreWLAN -framework Foundation"
             ]
-- 
cgit v1.2.3


From 0c498153331d79715ecfe431eb27065748628ba8 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Mon, 28 Jan 2019 17:11:35 +0200
Subject: Fix llvm-strip error

In NDKr19 they removed "-strip-all-gnu" argument, now
llvm-strip prints tons of:
.../llvm-strip: error: unknown argument '-strip-all-gnu'.

Change-Id: I11bb2d6abcc5f236730c57b5b93cc932c7ba58c6
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 src/tools/androiddeployqt/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 587ae21e4f..76c521ca8f 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1880,7 +1880,7 @@ bool stripFile(const Options &options, const QString &fileName)
     }
 
     if (options.useLLVM)
-        strip = QString::fromLatin1("%1 -strip-all -strip-all-gnu %2").arg(shellQuote(strip), shellQuote(fileName));
+        strip = QString::fromLatin1("%1 -strip-all %2").arg(shellQuote(strip), shellQuote(fileName));
     else
         strip = QString::fromLatin1("%1 %2").arg(shellQuote(strip), shellQuote(fileName));
 
-- 
cgit v1.2.3