From afb790032cb76761daa429bfb965f4dd5bb208ea Mon Sep 17 00:00:00 2001
From: Maxim Sheshukov <sheshukovmaxim@gmail.com>
Date: Mon, 15 Jul 2019 20:41:01 +0200
Subject: [PATCH] Remove android-g++ scope

---
 QJniHelpers/QJniHelpers.pri           | 27 ++++++++++++---------------
 QtAndroidHelpers/QtAndroidHelpers.pri |  4 ----
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/QJniHelpers/QJniHelpers.pri b/QJniHelpers/QJniHelpers.pri
index 2dce187..4262d55 100644
--- a/QJniHelpers/QJniHelpers.pri
+++ b/QJniHelpers/QJniHelpers.pri
@@ -1,17 +1,14 @@
-android-g++ {
+INCLUDEPATH += $$PWD
+QT += androidextras
 
-    INCLUDEPATH += $$PWD
-    QT += androidextras
+HEADERS += \
+    $$PWD/QJniHelpers.h \
+    $$PWD/QJniLangUtils.h \
+    $$PWD/QAndroidQPAPluginGap.h \
+    $$PWD/IJniObjectLinker.h \
+    $$PWD/TJniObjectLinker.h \
 
-    HEADERS += \
-        $$PWD/QJniHelpers.h \
-        $$PWD/QJniLangUtils.h \
-        $$PWD/QAndroidQPAPluginGap.h \
-        $$PWD/IJniObjectLinker.h \
-        $$PWD/TJniObjectLinker.h \
-
-    SOURCES += \
-        $$PWD/QJniHelpers.cpp \
-        $$PWD/QJniLangUtils.cpp \
-        $$PWD/QAndroidQPAPluginGap.cpp \
-}
+SOURCES += \
+    $$PWD/QJniHelpers.cpp \
+    $$PWD/QJniLangUtils.cpp \
+    $$PWD/QAndroidQPAPluginGap.cpp \
diff --git a/QtAndroidHelpers/QtAndroidHelpers.pri b/QtAndroidHelpers/QtAndroidHelpers.pri
index ca85649..4abf2da 100644
--- a/QtAndroidHelpers/QtAndroidHelpers.pri
+++ b/QtAndroidHelpers/QtAndroidHelpers.pri
@@ -1,6 +1,3 @@
-
-android-g++ {
-
 INCLUDEPATH += $$PWD
 
 HEADERS += \
@@ -53,4 +50,3 @@ SOURCES += \
     $$PWD/QAndroidToast.cpp \
     $$PWD/QAndroidDesktopUtils.cpp \
     $$PWD/QAndroidStorages.cpp
-}