d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #450 from kallisti5/haiku-fixes

Browse source 
Haiku fixes
This commit is contained in:
DeepBlueV7.X 2021-02-09 15:44:20 +01:00 committed by GitHub
commit 3797f585c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -647,7 +647,7 @@ if(QML_DEBUGGING)
endif() endif()
if(NOT MSVC) if(NOT MSVC AND NOT HAIKU)
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR CI_BUILD) if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR CI_BUILD)
target_compile_options(nheko PRIVATE "-Werror") target_compile_options(nheko PRIVATE "-Werror")
endif() endif()

6
src/notifications/Manager.h
View file

@ -4,7 +4,7 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
#include <QtDBus/QDBusArgument> #include <QtDBus/QDBusArgument>
#include <QtDBus/QDBusInterface> #include <QtDBus/QDBusInterface>
#endif #endif
@ -41,7 +41,7 @@ signals:
public slots: public slots:
void removeNotification(const QString &roomId, const QString &eventId); void removeNotification(const QString &roomId, const QString &eventId);
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
public: public:
void closeNotifications(QString roomId); void closeNotifications(QString roomId);
@ -61,7 +61,7 @@ private slots:
void notificationReplied(uint id, QString reply); void notificationReplied(uint id, QString reply);
}; };
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
QDBusArgument & QDBusArgument &
operator<<(QDBusArgument &arg, const QImage &image); operator<<(QDBusArgument &arg, const QImage &image);
const QDBusArgument & const QDBusArgument &