summaryrefslogtreecommitdiffstats
path: root/src/nfc
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-25 09:34:29 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-25 10:54:53 +0000
commitde51d11f61c794a27859b2a33eb2d135f55a288a (patch)
treecaa8de19253729eef9ae5005a55fe8dca3e9df03 /src/nfc
parenteda7220cc7f7f548e1a3317447b44977583ac26e (diff)
Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.
Fix usage of API that is marked deprecated. Change-Id: I82fe0911f6783a709356211b001e1d377f694642 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/nfc')
-rw-r--r--src/nfc/qnearfieldmanager_emulator_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nfc/qnearfieldmanager_emulator_p.h b/src/nfc/qnearfieldmanager_emulator_p.h
index 0fd980f9..a71c9fd5 100644
--- a/src/nfc/qnearfieldmanager_emulator_p.h
+++ b/src/nfc/qnearfieldmanager_emulator_p.h
@@ -50,7 +50,7 @@
#include "qndeffilter.h"
#include <QtCore/QObject>
-#include <QtCore/QWeakPointer>
+#include <QtCore/QPointer>
QT_BEGIN_NAMESPACE
@@ -74,7 +74,7 @@ private slots:
private:
void ndefReceived(const QNdefMessage &message, QNearFieldTarget *target);
- QMap<TagBase *, QWeakPointer<QNearFieldTarget> > m_targets;
+ QMap<TagBase *, QPointer<QNearFieldTarget> > m_targets;
};