Merge remote-tracking branch 'pixraider-remote/master' into static-build

qmsgpack.pri

@@ -0,0 +1,29 @@
+QT       += core location
+
+DEFINES += MSGPACK_MAKE_LIB
+
+INCLUDEPATH += $$PWD/src
+
+SOURCES += \
+    $$PWD/src/msgpack.cpp \
+    $$PWD/src/msgpackcommon.cpp \
+    $$PWD/src/private/pack_p.cpp \
+    $$PWD/src/private/unpack_p.cpp \
+    $$PWD/src/private/qt_types_p.cpp \
+    $$PWD/src/msgpackstream.cpp \
+    $$PWD/src/stream/time.cpp \
+    $$PWD/src/stream/geometry.cpp \
+    $$PWD/src/stream/location.cpp
+
+HEADERS += \
+    $$PWD/src/msgpack.h \
+    $$PWD/src/private/pack_p.h \
+    $$PWD/src/private/unpack_p.h \
+    $$PWD/src/endianhelper.h \
+    $$PWD/src/msgpackcommon.h \
+    $$PWD/src/msgpack_export.h \
+    $$PWD/src/private/qt_types_p.h \
+    $$PWD/src/msgpackstream.h \
+    $$PWD/src/stream/location.h \
+    $$PWD/src/stream/time.h \
+    $$PWD/src/stream/geometry.h

src/msgpackcommon.h

@@ -4,6 +4,12 @@
 #include <QVariant>
 #include <QtGlobal>
 
+#ifdef Q_OS_WINRT
+#include <stdint.h>
+#endif
+
+#include "msgpack_export.h"
+
 #define MSGPACK_MAJOR 0
 #define MSGPACK_MINOR 1
 #define MSGPACK_VERSION 0
@@ -24,7 +30,7 @@ typedef QVariant (*unpack_user_f)(const QByteArray &data);
  * @brief version
  * @return current version
  */
-QString version();
+MSGPACK_EXPORT QString version();
 /**
  * @brief The FirstByte enum
  * From Message Pack spec

src/msgpackcommon.h.in

@@ -4,6 +4,12 @@
 #include <QVariant>
 #include <QtGlobal>
 
+#ifdef Q_OS_WINRT
+#include <stdint.h>
+#endif
+
+#include "msgpack_export.h"
+
 #define MSGPACK_MAJOR @QMSGPACK_MAJOR@
 #define MSGPACK_MINOR @QMSGPACK_MINOR@
 #define MSGPACK_VERSION @QMSGPACK_VERSION@
@@ -24,7 +30,7 @@ typedef QVariant (*unpack_user_f)(const QByteArray &data);
  * @brief version
  * @return current version
  */
-QString version();
+MSGPACK_EXPORT QString version();
 /**
  * @brief The FirstByte enum
  * From Message Pack spec