Further porting of NFC module from mobility to Qt 5.
authorAaron McCarthy <mccarthy.aaron@gmail.com>
Mon, 1 Oct 2012 03:28:16 +0000 (13:28 +1000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 1 Oct 2012 10:04:55 +0000 (12:04 +0200)
commitf3d8f66116af4319650d8f3e7ca069275fdfa780
tree2b7dc73c029adfdf0302409a2422b3df4d9e5c54
parent3f4a920f87842e1bbb20f72ce04d6da7a866ab1d
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>
43 files changed:
examples/examples.pro
examples/nfc/nfc.pro [new file with mode: 0644]
examples/nfc/poster/poster.pro
examples/nfc/poster/qmlposter.cpp
src/imports/imports.pro
src/imports/nfc/nfc.pro
src/imports/nfc/plugin.cpp
src/imports/nfc/qdeclarativenearfield.cpp
src/imports/nfc/qdeclarativenearfield_p.h
src/imports/nfc/qdeclarativenearfieldsocket_p.h
src/nfc/nfc.pro
src/nfc/qdeclarativendefrecord.cpp
src/nfc/qllcpserver.cpp
src/nfc/qllcpserver_maemo6_p.cpp
src/nfc/qllcpsocket.cpp
src/nfc/qllcpsocket_maemo6_p.cpp
src/nfc/qnearfieldmanager.cpp
src/nfc/qnearfieldmanager.h
src/nfc/qnearfieldmanager_emulator.cpp
src/nfc/qnearfieldmanager_emulator_p.h
src/nfc/qnearfieldmanager_maemo6.cpp
src/nfc/qnearfieldmanager_simulator.cpp
src/nfc/qnearfieldmanagerimpl_p.cpp
src/nfc/qnearfieldmanagervirtualbase.cpp
src/nfc/qnearfieldtagtype1.cpp
src/nfc/qnearfieldtagtype2.cpp
src/nfc/qnearfieldtagtype3.cpp
src/nfc/qnearfieldtagtype4.cpp
src/nfc/qnearfieldtarget.cpp
src/nfc/qnearfieldtarget_emulator.cpp
src/nfc/qnearfieldtarget_emulator_p.h
src/nfc/targetemulator.cpp
src/nfc/targetemulator_p.h
src/src.pro
sync.profile
tests/auto/auto.pro
tests/auto/qnearfieldmanager/qnearfieldmanager.pro
tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp
tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
tests/tests.pro