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/nfc.pro | |
| 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/nfc.pro')
| -rw-r--r-- | src/nfc/nfc.pro | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index 58ea1c06..9d74ac04 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -3,6 +3,11 @@ QT = core load(qt_module) +# All classes in this module are in the QtNfc namespace. Define the namespace which moc generated +# code will be in. +DEFINES += QT_BEGIN_MOC_NAMESPACE=\""namespace QtNfc {"\" +DEFINES += QT_END_MOC_NAMESPACE=\""}"\" + PUBLIC_HEADERS += \ qnearfieldmanager.h \ qnearfieldtarget.h \ @@ -119,7 +124,7 @@ simulator { } isEmpty(NFC_BACKEND_AVAILABLE) { - # unsupported platform stub + message("Unsupported NFC platform, will not build a working QtNfc library.") PRIVATE_HEADERS += \ qllcpsocket_p.h \ |