Commit 51acfe4a authored by Jonah Brüchert's avatar Jonah Brüchert 🌳

Make kaidan build with MSVC2019

parent dd3b5c0f
......@@ -2,7 +2,6 @@
kaidan
kaidan_automoc.cpp
misc/ubuntu-touch/manifest.json
misc/windows/*-kaidan.png
misc/macos/kaidan.iconset
3rdparty/openssl
......
......@@ -114,7 +114,7 @@ if(ANDROID)
find_package(Qt5 REQUIRED COMPONENTS AndroidExtras)
endif()
if(ANDROID OR WIN32)
if(ANDROID)
find_package(PkgConfig REQUIRED)
pkg_search_module(OPENSSL REQUIRED openssl IMPORTED_TARGET)
message(STATUS "Using OpenSSL ${OPENSSL_VERSION}")
......@@ -139,7 +139,7 @@ endif()
#
# Include bundled icons on Ubuntu Touch, Android, Windows, macOS and iOS
if(BUNDLE_ICONS OR UBUNTU_TOUCH OR ANDROID OR WIN32 OR APPLE)
if(BUNDLE_ICONS OR UBUNTU_TOUCH OR ANDROID OR APPLE)
set(KAIDAN_ICONS_QRC kirigami-icons.qrc)
endif()
......@@ -209,11 +209,11 @@ elseif(TARGET ZXing::Core)
target_link_libraries(${PROJECT_NAME} ZXing::Core)
endif()
if(ANDROID OR WIN32 OR IOS)
if(ANDROID OR IOS)
target_link_libraries(${PROJECT_NAME} Qt5::QuickControls2 KF5::Kirigami2)
endif()
if(ANDROID OR WIN32)
if(ANDROID)
target_link_libraries(${PROJECT_NAME} PkgConfig::OPENSSL)
endif()
......@@ -413,11 +413,6 @@ if(UBUNTU_TOUCH AND CLICK_ARCH)
DESTINATION "${CMAKE_INSTALL_PREFIX}"
)
elseif(UNIX AND NOT APPLE)
# install kaidan binary
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/${PROJECT_NAME}
DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
)
# install kaidan media
install(DIRECTORY "data/"
DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}"
......@@ -443,6 +438,13 @@ elseif(UNIX AND NOT APPLE)
)
endif()
if(UNIX AND NOT APPLE OR WIN32)
# install kaidan binary
install(TARGETS kaidan
${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
)
endif()
# KNotifications
if(USE_KNOTIFICATIONS)
install(FILES misc/kaidan.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
......
......@@ -34,6 +34,8 @@
#include <QImage>
#include <QRgb>
#include <stdexcept>
#include "Kaidan.h"
#include "qxmpp-exts/QXmppUri.h"
......
......@@ -45,7 +45,7 @@ const QString ns_httpupload = "urn:xmpp:http:upload:0";
///
/// \ingroup Stanzas
class QXMPP_EXPORT QXmppHttpUploadRequestIq : public QXmppIq
class QXmppHttpUploadRequestIq : public QXmppIq
{
public:
QString fileName() const;
......@@ -80,7 +80,7 @@ bool operator==(const QXmppHttpUploadRequestIq &l, const QXmppHttpUploadRequestI
///
/// \ingroup Stanzas
class QXMPP_EXPORT QXmppHttpUploadSlotIq : public QXmppIq
class QXmppHttpUploadSlotIq : public QXmppIq
{
public:
QUrl putUrl() const;
......
......@@ -43,7 +43,7 @@ class QXmppUploadManager; // needed for QXmppHttpUpload
/// \class QXmppHttpUpload Represents a single HTTP file upload.
class QXMPP_EXPORT QXmppHttpUpload : public QXmppLoggable
class QXmppHttpUpload : public QXmppLoggable
{
Q_OBJECT
Q_PROPERTY(qint64 bytesSent READ bytesSent NOTIFY bytesSentChanged)
......@@ -117,7 +117,7 @@ bool operator==(const QXmppHttpUpload &l, const QXmppHttpUpload &r);
/// \class QXmppHttpUploadManager This class extends the \see QXmppUploadCoreManager by also
/// handling the actual upload via. HTTP.
class QXMPP_EXPORT QXmppUploadManager : public QXmppUploadRequestManager
class QXmppUploadManager : public QXmppUploadRequestManager
{
Q_OBJECT
......
......@@ -36,7 +36,7 @@
class QFileInfo;
class QXMPP_EXPORT QXmppUploadService
class QXmppUploadService
{
public:
QString jid() const;
......@@ -55,7 +55,7 @@ private:
/// upload slots. It doesn't do the actual upload via. HTTP, \see QXmppUploadManager for that
/// purpose.
class QXMPP_EXPORT QXmppUploadRequestManager : public QXmppClientExtension
class QXmppUploadRequestManager : public QXmppClientExtension
{
Q_OBJECT
Q_PROPERTY(bool serviceFound READ serviceFound NOTIFY serviceFoundChanged)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment