Merge pull request #62 from tribal-tec/master

Fix MSVC build

Author: Raphael Dumusc

.gitexternals

@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-# CMake/common https://github.com/Eyescale/CMake.git 9a0223f
+# CMake/common https://github.com/Eyescale/CMake.git c351af3

deflect/config.h

@@ -45,6 +45,9 @@
 #    define final
 #    define override
 #  endif
+#  ifndef CXX_NOEXCEPT_SUPPORTED
+#    define noexcept
+#  endif
 #endif
 
 #endif

deflect/qt/QmlStreamer.h

@@ -40,6 +40,8 @@
 #ifndef QMLSTREAMER_H
 #define QMLSTREAMER_H
 
+#include <deflect/qt/api.h>
+
 #include <QString>
 #include <QQuickItem>
 
@@ -67,12 +69,13 @@ class QmlStreamer
      * @param qmlFile URL to QML file to load
      * @param streamHost hostname of the Deflect server
      */
-    QmlStreamer( const QString& qmlFile, const std::string& streamHost );
+    DEFLECTQT_API QmlStreamer( const QString& qmlFile,
+                               const std::string& streamHost );
 
-    ~QmlStreamer();
+    DEFLECTQT_API ~QmlStreamer();
 
     /** @return the QML root item, might be nullptr if not ready yet. */
-    QQuickItem* getRootItem();
+    DEFLECTQT_API QQuickItem* getRootItem();
 
 private:
     QmlStreamer( const QmlStreamer& ) = delete;

deflect/qt/QmlStreamerImpl.cpp

@@ -75,8 +75,7 @@ namespace deflect
 namespace qt
 {
 
-QmlStreamer::QmlStreamer::Impl::Impl( const QString& qmlFile,
-                                      const std::string& streamHost )
+QmlStreamer::Impl::Impl( const QString& qmlFile, const std::string& streamHost )
     : QWindow()
     , _context( new QOpenGLContext )
     , _offscreenSurface( new QOffscreenSurface )