Remove not needed public header

The namespace is Android backend specific. No need to export it as part
of a separate global header.

Change-Id: Ia6eff3ac6936c427b82c4e81507c6695e40ed11e
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

3 files changed, 5 insertions, 52 deletions

diff --git a/src/nfc/android/androidglobal.h b/src/nfc/android/androidglobal.h
deleted file mode 100644
index 271ab2c3..00000000
--- a/src/nfc/android/androidglobal.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Centria research and development
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtNfc module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ANDROIDGLOBAL_H
-#define ANDROIDGLOBAL_H
-
-#define QT_USE_ANDROIDNFC_NAMESPACE using namespace ::AndroidNfc;
-#define QT_BEGIN_ANDROIDNFC_NAMESPACE namespace AndroidNfc {
-#define QT_END_ANDROIDNFC_NAMESPACE }
-
-#endif // ANDROIDGLOBAL_H
diff --git a/src/nfc/android/androidjninfc_p.h b/src/nfc/android/androidjninfc_p.h
index 21e3087e..dbd2867a 100644
--- a/src/nfc/android/androidjninfc_p.h
+++ b/src/nfc/android/androidjninfc_p.h
@@ -42,11 +42,14 @@
 #ifndef ANDROIDJNINFC_H
 #define ANDROIDJNINFC_H
 
-#include "androidglobal.h"
 #include "qglobal.h"
 
 #include <jni.h>
 
+#define QT_USE_ANDROIDNFC_NAMESPACE using namespace ::AndroidNfc;
+#define QT_BEGIN_ANDROIDNFC_NAMESPACE namespace AndroidNfc {
+#define QT_END_ANDROIDNFC_NAMESPACE }
+
 QT_BEGIN_ANDROIDNFC_NAMESPACE
 
 class AndroidNfcListenerInterface
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro
index 30bf26c5..fd772f0e 100644
--- a/src/nfc/nfc.pro
+++ b/src/nfc/nfc.pro
@@ -197,5 +197,4 @@ isEmpty(NFC_BACKEND_AVAILABLE) {
         qnearfieldsharetargetimpl_p.cpp
 }
 
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS \
-    android/androidglobal.h
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS