diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-06-24 14:53:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-26 12:12:35 +0200 |
| commit | d4886e1a50fd546f8e059ef9c539932d6d58c96d (patch) | |
| tree | 341a8cba6b0bd5cedd8f30a0e52742e6a8742eda /src/nfc/qndefrecord.cpp | |
| parent | f2d6f3b6a6c5eebc36e0206c85896c1142f31229 (diff) | |
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>
Diffstat (limited to 'src/nfc/qndefrecord.cpp')
| -rw-r--r-- | src/nfc/qndefrecord.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/nfc/qndefrecord.cpp b/src/nfc/qndefrecord.cpp index fea5dae4..ed950ea0 100644 --- a/src/nfc/qndefrecord.cpp +++ b/src/nfc/qndefrecord.cpp @@ -43,6 +43,8 @@ #include "qndefrecord.h" #include "qndefrecord_p.h" +#include <QtCore/QHash> + QT_BEGIN_NAMESPACE_NFC /*! @@ -147,6 +149,11 @@ QT_BEGIN_NAMESPACE_NFC \sa Q_DECLARE_NDEF_RECORD() */ +uint qHash(const QNdefRecord &key) +{ + return qHash(key.type() + key.id() + key.payload()); +} + /*! Constructs a new empty NDEF record. */ |