QtConnectivity: Fix compile on Windows.

Change-Id: I7b8bd2c120c9905a581eee66146378b9373d1cb2
Reviewed-on: http://codereview.qt-project.org/6157
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Zanetti <mzanetti@kde.org>
Reviewed-by: Alex <alex.blasche@nokia.com>

6 files changed, 16 insertions, 12 deletions

diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h
index d013cc8b..e7f18108 100644
--- a/src/bluetooth/qbluetoothlocaldevice.h
+++ b/src/bluetooth/qbluetoothlocaldevice.h
@@ -58,11 +58,11 @@ class QBluetoothLocalDevicePrivate;
 class Q_BLUETOOTH_EXPORT QBluetoothHostInfo
 {
 public:
-    QBluetoothHostInfo() { };
+    QBluetoothHostInfo() { }
     QBluetoothHostInfo(const QBluetoothHostInfo &other) {
         m_address = other.m_address;
         m_name = other.m_name;
-    };
+    }
 
     QBluetoothAddress getAddress() const { return m_address; }
     void setAddress(const QBluetoothAddress &address) { m_address = address; }
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index 6968e212..40c94850 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -66,7 +66,7 @@ QT_BEGIN_HEADER
 
 class QBluetoothAddress;
 
-#ifdef QT_BLUEZ_BLUETOOTH
+#if defined(QT_BLUEZ_BLUETOOTH)
 class QBluetoothLocalDevicePrivate : public QObject,
                                      protected QDBusContext
 {
@@ -104,9 +104,9 @@ private:
 
     QBluetoothLocalDevice *q_ptr;
 };
-#endif
 
-#ifdef QT_SYMBIAN_BLUETOOTH
+#elif defined(QT_SYMBIAN_BLUETOOTH)
+
 class QBluetoothLocalDevicePrivate
         : public MBTEngSettingsObserver
 {
@@ -144,6 +144,10 @@ protected:
     QBluetoothLocalDevice *q_ptr;
 
 };
+#else
+class QBluetoothLocalDevicePrivate : public QObject
+{
+};
 #endif
 
 QT_END_HEADER
diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp
index db7a7d2e..5b404fa6 100644
--- a/src/nfc/qdeclarativendefrecord.cpp
+++ b/src/nfc/qdeclarativendefrecord.cpp
@@ -144,11 +144,11 @@ static QString urnForRecordType(QNdefRecord::TypeNameFormat typeNameFormat, cons
 {
     switch (typeNameFormat) {
     case QNdefRecord::NfcRtd:
-        return QLatin1String("urn:nfc:wkt:") + type;
+        return QLatin1String("urn:nfc:wkt:") + QString::fromLatin1(type);
     case QNdefRecord::ExternalRtd:
-        return QLatin1String("urn:nfc:ext:") + type;
+        return QLatin1String("urn:nfc:ext:") + QString::fromLatin1(type);
     case QNdefRecord::Mime:
-        return QLatin1String("urn:nfc:mime:") + type;
+        return QLatin1String("urn:nfc:mime:") + QString::fromLatin1(type);
     default:
         return QString();
     }
diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h
index 1e065f0a..cffda098 100644
--- a/src/nfc/qnearfieldmanager.h
+++ b/src/nfc/qnearfieldmanager.h
@@ -63,7 +63,7 @@ public:
         NoTargetAccess = 0x00,
         NdefReadTargetAccess = 0x01,
         NdefWriteTargetAccess = 0x02,
-        TagTypeSpecificTargetAccess = 0x04,
+        TagTypeSpecificTargetAccess = 0x04
     };
     Q_DECLARE_FLAGS(TargetAccessModes, TargetAccessMode)
 
diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qnfcglobal.h
index 61f9a04a..6b68c257 100644
--- a/src/nfc/qnfcglobal.h
+++ b/src/nfc/qnfcglobal.h
@@ -51,13 +51,13 @@
 #    if defined(QT_DLL)
 #      undef QT_DLL
 #    endif
-#    if defined(QT_BUILD_BT_LIB)
+#    if defined(QT_BUILD_NFC_LIB)
 #      define Q_NFC_EXPORT Q_DECL_EXPORT
 #    else
 #      define Q_NFC_EXPORT Q_DECL_IMPORT
 #    endif
 #  elif defined(QT_DLL)
-#    define Q_NFC_EXPORT Q_DECL_EXPORT
+#    define Q_NFC_EXPORT Q_DECL_IMPORT
 #  endif
 #endif
 
diff --git a/src/nfc/qtlv.cpp b/src/nfc/qtlv.cpp
index 83c5d585..7aa61e9a 100644
--- a/src/nfc/qtlv.cpp
+++ b/src/nfc/qtlv.cpp
@@ -345,7 +345,7 @@ void QTlvWriter::writeTlv(quint8 tagType, const QByteArray &data)
         if (length < 0xff) {
             m_buffer.append(quint8(length));
         } else {
-            m_buffer.append(0xff);
+            m_buffer.append(char(0xff));
             m_buffer.append(quint16(length) >> 8);
             m_buffer.append(quint16(length) & 0x00ff);
         }