Adapt to MSVC linker

httpserver/CMakeLists.txt

@@ -33,6 +33,7 @@ set(httpserver_HEADERS
 
 include_directories(
 	.
+    ${CMAKE_SOURCE_DIR}/sdrbase	
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 

httpserver/httpconnectionhandler.h

@@ -18,6 +18,8 @@
 #include "httprequesthandler.h"
 #include "httplistenersettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /** Alias type definition, for compatibility to different Qt versions */
@@ -47,7 +49,7 @@ namespace qtwebapp {
   The readTimeout value defines the maximum time to wait for a complete HTTP request.
   @see HttpRequest for description of config settings maxRequestSize and maxMultiPartSize.
 */
-class DECLSPEC HttpConnectionHandler : public QThread {
+class HTTPSERVER_API HttpConnectionHandler : public QThread {
     Q_OBJECT
     Q_DISABLE_COPY(HttpConnectionHandler)
 

httpserver/httpconnectionhandlerpool.h

@@ -9,6 +9,8 @@
 #include "httpconnectionhandler.h"
 #include "httplistenersettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -46,7 +48,7 @@ namespace qtwebapp {
   @see HttpRequest for description of config settings maxRequestSize and maxMultiPartSize
 */
 
-class DECLSPEC HttpConnectionHandlerPool : public QObject {
+class HTTPSERVER_API HttpConnectionHandlerPool : public QObject {
     Q_OBJECT
     Q_DISABLE_COPY(HttpConnectionHandlerPool)
 public:

httpserver/httpcookie.h

@@ -10,6 +10,8 @@
 #include <QByteArray>
 #include "httpglobal.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -18,7 +20,7 @@ namespace qtwebapp {
   2109.
 */
 
-class DECLSPEC HttpCookie
+class HTTPSERVER_API HttpCookie
 {
 public:
 

httpserver/httplistener.h

@@ -15,6 +15,8 @@
 #include "httprequesthandler.h"
 #include "httplistenersettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -42,7 +44,7 @@ namespace qtwebapp {
   @see HttpRequest for description of config settings maxRequestSize and maxMultiPartSize
 */
 
-class DECLSPEC HttpListener : public QTcpServer {
+class HTTPSERVER_API HttpListener : public QTcpServer {
     Q_OBJECT
     Q_DISABLE_COPY(HttpListener)
 public:

httpserver/httprequest.h

@@ -17,6 +17,8 @@
 #include "httpglobal.h"
 #include "httplistenersettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -36,7 +38,7 @@ namespace qtwebapp {
   The body is always a little larger than the file itself.
 */
 
-class DECLSPEC HttpRequest {
+class HTTPSERVER_API HttpRequest {
     Q_DISABLE_COPY(HttpRequest)
     friend class HttpSessionStore;
 

httpserver/httprequesthandler.h

@@ -10,6 +10,8 @@
 #include "httprequest.h"
 #include "httpresponse.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -24,7 +26,7 @@ namespace qtwebapp {
    @see StaticFileController which delivers static local files.
 */
 
-class DECLSPEC HttpRequestHandler : public QObject {
+class HTTPSERVER_API HttpRequestHandler : public QObject {
     Q_OBJECT
     Q_DISABLE_COPY(HttpRequestHandler)
 public:

httpserver/httpresponse.h

@@ -12,6 +12,8 @@
 #include "httpglobal.h"
 #include "httpcookie.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -33,7 +35,7 @@ namespace qtwebapp {
   before calling write(). Web Browsers use that information to display a progress bar.
 */
 
-class DECLSPEC HttpResponse {
+class HTTPSERVER_API HttpResponse {
     Q_DISABLE_COPY(HttpResponse)
 public:
 

httpserver/httpsession.h

@@ -11,6 +11,8 @@
 #include <QReadWriteLock>
 #include "httpglobal.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -20,7 +22,7 @@ namespace qtwebapp {
   @see HttpSessionStore should be used to create and get instances of this class.
 */
 
-class DECLSPEC HttpSession {
+class HTTPSERVER_API HttpSession {
 
 public:
 
@@ -53,7 +55,7 @@ public:
     QByteArray getId() const;
 
     /**
-      Null sessions cannot store data. All calls to set() and remove() 
+      Null sessions cannot store data. All calls to set() and remove()
       do not have any effect.This method is thread safe.
     */
     bool isNull() const;

httpserver/httpsessionstore.h

@@ -16,6 +16,8 @@
 #include "httprequest.h"
 #include "httpsessionssettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -33,7 +35,7 @@ namespace qtwebapp {
   </pre></code>
 */
 
-class DECLSPEC HttpSessionStore : public QObject {
+class HTTPSERVER_API HttpSessionStore : public QObject {
     Q_OBJECT
     Q_DISABLE_COPY(HttpSessionStore)
 public:

httpserver/staticfilecontroller.h

@@ -13,6 +13,8 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -44,7 +46,7 @@ namespace qtwebapp {
 
 class HttpDocrootSettings;
 
-class DECLSPEC StaticFileController : public HttpRequestHandler  {
+class HTTPSERVER_API StaticFileController : public HttpRequestHandler  {
     Q_OBJECT
     Q_DISABLE_COPY(StaticFileController)
 public: