From d4886e1a50fd546f8e059ef9c539932d6d58c96d Mon Sep 17 00:00:00 2001 From: Alex Blasche 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 --- examples/nfc/ndefeditor/mimeimagerecordeditor.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'examples/nfc/ndefeditor/mimeimagerecordeditor.h') 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 { -- cgit v1.2.3