diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
| commit | fb3e9bc2d941462f1244aaf0ea79425a307f883d (patch) | |
| tree | afce91959098ec887ce466abc6e40342261df3db /src/connectivity/nfc/nfc.pri | |
| parent | c61d909c7b815319e40ba27d7f84e92aa5f1f946 (diff) | |
| parent | 6f0dc7cc40dd63763a581a7fb6d4e76649b8026c (diff) | |
Merge branch 'master' into 1.2.0v1.2.0
Diffstat (limited to 'src/connectivity/nfc/nfc.pri')
| -rw-r--r-- | src/connectivity/nfc/nfc.pri | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/connectivity/nfc/nfc.pri b/src/connectivity/nfc/nfc.pri index faab00e302..49da2a65dd 100644 --- a/src/connectivity/nfc/nfc.pri +++ b/src/connectivity/nfc/nfc.pri @@ -13,7 +13,8 @@ PUBLIC_HEADERS += \ nfc/qllcpsocket.h \ nfc/qnearfieldtagtype3.h \ nfc/qnearfieldtagtype4.h \ - nfc/qllcpserver.h + nfc/qllcpserver.h \ + nfc/qdeclarativendefrecord.h PRIVATE_HEADERS += \ nfc/qndefrecord_p.h \ @@ -36,15 +37,8 @@ SOURCES += \ nfc/qllcpsocket.cpp \ nfc/qnearfieldtagtype4.cpp \ nfc/qtlv.cpp \ - nfc/qllcpserver.cpp - -contains(QT_CONFIG,declarative) { - PUBLIC_HEADERS += \ - nfc/qdeclarativendefrecord.h - - SOURCES += \ - nfc/qdeclarativendefrecord.cpp -} + nfc/qllcpserver.cpp \ + nfc/qdeclarativendefrecord.cpp maemo6|meego { NFC_BACKEND_AVAILABLE = yes |