From 4b03570f2ab82889305db88092b8612af5d812a0 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Mon, 21 Aug 2017 14:30:13 +0200
Subject: Rename qnfcglobal.h to qtnfcglobal.h

... and deprecate the former. By doing so we get the header
file in line with other modules - see qtnetworkglobal.h for
example.

The include is not used in the examples so it is removed
there.

Change-Id: If6d30e7a821b60f12768a963990937c46f21f4c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 examples/nfc/annotatedurl/annotatedurl.h        | 1 -
 examples/nfc/ndefeditor/mainwindow.h            | 2 --
 examples/nfc/ndefeditor/mimeimagerecordeditor.h | 2 --
 3 files changed, 5 deletions(-)

(limited to 'examples')

diff --git a/examples/nfc/annotatedurl/annotatedurl.h b/examples/nfc/annotatedurl/annotatedurl.h
index 08e5b38e..853bdd7f 100644
--- a/examples/nfc/annotatedurl/annotatedurl.h
+++ b/examples/nfc/annotatedurl/annotatedurl.h
@@ -41,7 +41,6 @@
 #ifndef ANNOTATEDURL_H
 #define ANNOTATEDURL_H
 
-#include <qnfcglobal.h>
 #include <QNdefMessage>
 
 #include <QtCore/QObject>
diff --git a/examples/nfc/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h
index 374b2ee3..69eeee30 100644
--- a/examples/nfc/ndefeditor/mainwindow.h
+++ b/examples/nfc/ndefeditor/mainwindow.h
@@ -43,8 +43,6 @@
 
 #include <QMainWindow>
 
-#include <qnfcglobal.h>
-
 #include <qnearfieldtarget.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
index 996cabc3..ef6506f3 100644
--- a/examples/nfc/ndefeditor/mimeimagerecordeditor.h
+++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
@@ -42,8 +42,6 @@
 #ifndef MIMEIMAGERECORDEDITOR_H
 #define MIMEIMAGERECORDEDITOR_H
 
-#include <qnfcglobal.h>
-
 #include <QWidget>
 
 #include <qndefrecord.h>
-- 
cgit v1.2.3