From 2666f3e37d6c8f2125f77f8de2cf5582ead7c18e Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Thu, 22 Apr 2021 18:31:01 +0300
Subject: [PATCH] Fix build error when using -qtnamespace flag

Error: qtbase/src/corelib/io/qstandardpaths_android.cpp:49:17: error: no
namespace named 'QNativeInterface'; did you mean
'XXXXX::QNativeInterface'?

Pick-to: 6.1
Change-Id: I0f9fbf1879f72683d31ee0e8603b9bb26c31ae3c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/corelib/io/qstandardpaths_android.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/io/qstandardpaths_android.cpp b/src/corelib/io/qstandardpaths_android.cpp
index 129ae03158..d5ece85818 100644
--- a/src/corelib/io/qstandardpaths_android.cpp
+++ b/src/corelib/io/qstandardpaths_android.cpp
@@ -46,10 +46,10 @@
 #include <QtCore/qcoreapplication.h>
 #include <QDir>
 
-using namespace QNativeInterface;
-
 QT_BEGIN_NAMESPACE
 
+using namespace QNativeInterface;
+
 typedef QMap<QString, QString> AndroidDirCache;
 Q_GLOBAL_STATIC(AndroidDirCache, androidDirCache)