From d4886e1a50fd546f8e059ef9c539932d6d58c96d Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@digia.com>
Date: Mon, 24 Jun 2013 14:53:53 +0200
Subject: Enable Qt NFC in the CI system.

Don't require CONFIG+=nfc to build QtNfc lib.
This prevents proper test execution and there is no API commitment until
the API is offcially released anyway.

Excludes three auto tests from -developer-build builds
as they require Q_AUTOTEST_EXPORT.

Fixes compile errors associated to namespace'd builds of Qt.

Revert "Remove not needed symbol 'qHash(const QNdefRecord&)'"
The symbol is needed during compilation by Windows.
This reverts commit 39901af48f40f0672731a1f62dc003c4b37d1fec.

Change-Id: I61c644bbfc4906729e6d2b9deb741989030c8624
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
---
 examples/nfc/annotatedurl/mainwindow.h          | 2 ++
 examples/nfc/ndefeditor/mainwindow.h            | 2 ++
 examples/nfc/ndefeditor/mimeimagerecordeditor.h | 3 +++
 examples/nfc/ndefeditor/textrecordeditor.h      | 2 ++
 examples/nfc/ndefeditor/urirecordeditor.h       | 2 ++
 5 files changed, 11 insertions(+)

(limited to 'examples/nfc')

diff --git a/examples/nfc/annotatedurl/mainwindow.h b/examples/nfc/annotatedurl/mainwindow.h
index b90e4a47..b038be4a 100644
--- a/examples/nfc/annotatedurl/mainwindow.h
+++ b/examples/nfc/annotatedurl/mainwindow.h
@@ -45,9 +45,11 @@
 
 QT_FORWARD_DECLARE_CLASS(QUrl)
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class MainWindow;
 }
+QT_END_NAMESPACE
 
 class MainWindow : public QMainWindow
 {
diff --git a/examples/nfc/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h
index c6fc9bf7..ea44e074 100644
--- a/examples/nfc/ndefeditor/mainwindow.h
+++ b/examples/nfc/ndefeditor/mainwindow.h
@@ -54,9 +54,11 @@ QT_END_NAMESPACE_NFC
 
 QT_USE_NAMESPACE_NFC
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class MainWindow;
 }
+QT_END_NAMESPACE
 
 class MainWindow : public QMainWindow
 {
diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
index 0bad7694..fabfe5f6 100644
--- a/examples/nfc/ndefeditor/mimeimagerecordeditor.h
+++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
@@ -50,9 +50,12 @@
 
 QT_USE_NAMESPACE_NFC
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class MimeImageRecordEditor;
 }
+QT_END_NAMESPACE
+
 
 class MimeImageRecordEditor : public QWidget
 {
diff --git a/examples/nfc/ndefeditor/textrecordeditor.h b/examples/nfc/ndefeditor/textrecordeditor.h
index 798eef49..c5b51cc4 100644
--- a/examples/nfc/ndefeditor/textrecordeditor.h
+++ b/examples/nfc/ndefeditor/textrecordeditor.h
@@ -45,9 +45,11 @@
 
 #include <qndefnfctextrecord.h>
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class TextRecordEditor;
 }
+QT_END_NAMESPACE
 
 QT_USE_NAMESPACE_NFC
 
diff --git a/examples/nfc/ndefeditor/urirecordeditor.h b/examples/nfc/ndefeditor/urirecordeditor.h
index edfdd333..02fc910e 100644
--- a/examples/nfc/ndefeditor/urirecordeditor.h
+++ b/examples/nfc/ndefeditor/urirecordeditor.h
@@ -46,9 +46,11 @@
 
 #include <qndefnfcurirecord.h>
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class UriRecordEditor;
 }
+QT_END_NAMESPACE
 
 QT_USE_NAMESPACE_NFC
 
-- 
cgit v1.2.3