From 7a5643642666c132f93276e292ab6a42385c0ce4 Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Wed, 22 Feb 2017 14:47:51 +0100 Subject: [PATCH] Configured for MSVS build. --- libEet/eetresult.h | 5 +++-- libEet/eetsender.cpp | 1 + libEet/eetsender.h | 4 ++-- libEet/libEet.pro | 12 +++++++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libEet/eetresult.h b/libEet/eetresult.h index b22cc97..27dade4 100644 --- a/libEet/eetresult.h +++ b/libEet/eetresult.h @@ -6,8 +6,9 @@ #include #include #include +#include "eetcpp_global.h" -class EetMessage : public QObject +class EETCPPSHARED_EXPORT EetMessage : public QObject { Q_OBJECT public: @@ -27,7 +28,7 @@ private: typedef QList EetMessageList; -class EetResult : public QObject +class EETCPPSHARED_EXPORT EetResult : public QObject { Q_OBJECT public: diff --git a/libEet/eetsender.cpp b/libEet/eetsender.cpp index 66e4cf6..5cffd36 100644 --- a/libEet/eetsender.cpp +++ b/libEet/eetsender.cpp @@ -3,6 +3,7 @@ #include "eetsender.h" #include "eetsigner.h" +#include "eettemplate.h" #include #include diff --git a/libEet/eetsender.h b/libEet/eetsender.h index 81481ec..fa7d5ec 100644 --- a/libEet/eetsender.h +++ b/libEet/eetsender.h @@ -5,11 +5,11 @@ #include "eetcpp_global.h" #include "eetrequest.h" -#include "eettemplate.h" #include "eetresult.h" class QNetworkAccessManager; class QNetworkReply; +class EetSigner; class EETCPPSHARED_EXPORT EetSender : public QObject { @@ -40,7 +40,7 @@ private slots: signals: void certError(); void sendError(); - void responseRecieved(EetRequest *result); + void responseRecieved(EetResult *result); void signInvalid(); void serviceCertError(); diff --git a/libEet/libEet.pro b/libEet/libEet.pro index 2546763..d689782 100644 --- a/libEet/libEet.pro +++ b/libEet/libEet.pro @@ -4,6 +4,10 @@ # #------------------------------------------------- +win32 { + QCA_PATH = d:/prac/qt/lib/qca +} + QT += network xml xmlpatterns QT -= gui @@ -35,7 +39,13 @@ unix { INSTALLS += target } -LIBS += -lqca-qt5 +win32 { + INCLUDEPATH += $$QCA_PATH/include +} + +win32:CONFIG(release, debug|release): LIBS += -L$$QCA_PATH -lqca-qt5 +else:win32:CONFIG(debug, debug|release): LIBS += -L$$QCA_PATH -lqca-qt5d +else:unix: LIBS += -lqca-qt5 RESOURCES += \ resource.qrc