diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2012-10-01 13:28:16 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-01 12:04:55 +0200 |
| commit | f3d8f66116af4319650d8f3e7ca069275fdfa780 (patch) | |
| tree | 2b7dc73c029adfdf0302409a2422b3df4d9e5c54 /src/nfc/qnearfieldtarget_emulator_p.h | |
| parent | 3f4a920f87842e1bbb20f72ce04d6da7a866ab1d (diff) | |
Further porting of NFC module from mobility to Qt 5.
Includes the following changes:
* Conditionally enables building of the NFC module when qmake is
run with CONFIG+=nfc.
* Correctly build within the QtNfc namespace.
* Fix compile errors in examples, enable building of NFC examples.
* Fix compile errors in tests, enable building of NFC tests.
Mark the some NFC tests as insignificant as they currently crash.
Notably does not enable NFC documentation generation.
Task-number: QTBUG-22015
Change-Id: I9ff170c45848c8f0215e9427797922f840c2f015
Reviewed-by: Alex <ablasche@gmail.com>
Diffstat (limited to 'src/nfc/qnearfieldtarget_emulator_p.h')
| -rw-r--r-- | src/nfc/qnearfieldtarget_emulator_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nfc/qnearfieldtarget_emulator_p.h b/src/nfc/qnearfieldtarget_emulator_p.h index 42002693..10b42fb7 100644 --- a/src/nfc/qnearfieldtarget_emulator_p.h +++ b/src/nfc/qnearfieldtarget_emulator_p.h @@ -48,6 +48,10 @@ #include <QtCore/QMap> +QT_BEGIN_HEADER + +QTNFC_BEGIN_NAMESPACE + class TagType1 : public QNearFieldTagType1 { Q_OBJECT @@ -111,4 +115,8 @@ private: int timerId; }; +QTNFC_END_NAMESPACE + +QT_END_HEADER + #endif // QNEARFIELDTARGET_EMULATOR_P_H |