diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-25 09:34:29 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-25 10:54:53 +0000 |
| commit | de51d11f61c794a27859b2a33eb2d135f55a288a (patch) | |
| tree | caa8de19253729eef9ae5005a55fe8dca3e9df03 | |
| parent | eda7220cc7f7f548e1a3317447b44977583ac26e (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>
4 files changed, 2 insertions, 6 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; }; diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro index 558f00fd..0361235a 100644 --- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro +++ b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro @@ -22,5 +22,3 @@ SOURCES += \ targetemulator.cpp DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 - diff --git a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro index 4452dac4..649541fd 100644 --- a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro +++ b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro @@ -22,4 +22,3 @@ SOURCES += \ targetemulator.cpp DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro index c53a5657..45d2fbe8 100644 --- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro +++ b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro @@ -22,4 +22,3 @@ SOURCES += \ targetemulator.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |