From 3849f08a66f103221cd76fdddc1305943943b3c6 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 14 Apr 2011 14:47:18 +1000 Subject: Include declarative related symbols even when building against Qt 4.6. --- src/connectivity/nfc/nfc.pri | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/connectivity/nfc/nfc.pri') 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 -- cgit v1.2.3