Commit 5f6ff4c0 authored by melvo's avatar melvo

Merge branch 'stable'

parents 337850f6 da3dd3df
Pipeline #5338 failed with stages
in 34 seconds
......@@ -17,11 +17,12 @@ if(UBUNTU_TOUCH)
endif()
set(VERSION_STRING "0.5.0-dev")
set(DEVELOPMENT_BUILD TRUE)
set(ANDROID_VERSION_CODE 5)
set(ANDROID_VERSION_CODE 6)
# CMake options
option(I18N "Enable i18n support" FALSE)
option(STATIC_BUILD "Build Kaidan statically")
option(APPIMAGE "Build Kaidan as AppImage (will only work in the appimage script)" FALSE)
option(UBUNTU_TOUCH "Building an Ubuntu Touch click (internal use only!)" FALSE)
option(CLICK_ARCH "Architecture that will be used in the click's manifest")
option(CLICK_DATE "Date used in the version number in the click's manifest")
......@@ -57,8 +58,12 @@ kde_enable_exceptions()
find_package(PkgConfig REQUIRED)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Qml Quick Svg Sql QuickControls2 Xml Multimedia)
find_package(KF5Kirigami2 REQUIRED)
<<<<<<< HEAD
find_package(ZXing REQUIRED COMPONENTS Core)
pkg_search_module(QXmpp REQUIRED qxmpp>=1.0)
=======
pkg_search_module(QXmpp REQUIRED qxmpp>=0.8.3)
>>>>>>> stable
# Optional QtQuickCompiler
if(QUICK_COMPILER)
......@@ -326,8 +331,8 @@ endif()
if(UBUNTU_TOUCH)
set(KAIDAN_COMPILE_DEFINITIONS UBUNTU_TOUCH=True)
elseif(NOT ANDROID AND NOT IOS AND NOT WIN32 AND NOT APPLE)
set(KAIDAN_COMPILE_DEFINITIONS NOTIFICATIONS_LIBNOTIFY=True)
elseif(APPIMAGE)
set(KAIDAN_COMPILE_DEFINITIONS APPIMAGE=True)
endif()
if(STATIC_BUILD)
......
# Changelog
### Version 0.4.1 (released on Jul 16, 2019)
* Fix SSL problems for AppImage (lnj)
* Fix connection problems (lnj)
* Keep QXmpp v0.8.3 compatibility (lnj)
### Version 0.4.0 (released on Jul 08, 2019)
Build system:
......
......@@ -57,7 +57,9 @@ bool Message::operator==(const Message &m) const
m.to() == to() &&
m.type() == type() &&
m.stamp() == stamp() &&
#if (QXMPP_VERSION) >= QT_VERSION_CHECK(1, 0, 0)
m.outOfBandUrl() == outOfBandUrl() &&
#endif
m.isSent() == isSent() &&
m.isDelivered() == isDelivered() &&
m.mediaType() == mediaType() &&
......@@ -182,3 +184,15 @@ void Message::setSpoilerHint(const QString &spoilerHint)
{
m_spoilerHint = spoilerHint;
}
#if (QXMPP_VERSION) < QT_VERSION_CHECK(1, 0, 0)
QString Message::outOfBandUrl() const
{
return m_outOfBandUrl;
}
void Message::setOutOfBandUrl(const QString &outOfBandUrl)
{
m_outOfBandUrl = outOfBandUrl;
}
#endif
......@@ -81,11 +81,16 @@ public:
qint64 mediaSize() const;
void setMediaSize(const qint64 &mediaSize);
bool isSpoiler() const;
void setIsSpoiler(bool isSpoiler);
bool isSpoiler() const;
void setIsSpoiler(bool isSpoiler);
QString spoilerHint() const;
void setSpoilerHint(const QString &spoilerHint);
QString spoilerHint() const;
void setSpoilerHint(const QString &spoilerHint);
#if (QXMPP_VERSION) < QT_VERSION_CHECK(1, 0, 0)
QString outOfBandUrl() const;
void setOutOfBandUrl(const QString &outOfBandUrl);
#endif
private:
/**
......@@ -142,6 +147,10 @@ private:
* Hint of the spoiler message.
*/
QString m_spoilerHint;
#if (QXMPP_VERSION) < QT_VERSION_CHECK(1, 0, 0)
QString m_outOfBandUrl;
#endif
};
#endif // MESSAGE_H
......@@ -145,6 +145,10 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
qputenv("QT_QUICK_CONTROLS_MOBILE", "true");
#endif
#ifdef APPIMAGE
qputenv("OPENSSL_CONF", "");
#endif
// name, display name, description
QGuiApplication::setApplicationName(APPLICATION_NAME);
QGuiApplication::setApplicationDisplayName(APPLICATION_DISPLAY_NAME);
......
......@@ -101,7 +101,7 @@ echo "*****************************************"
-DCMAKE_PREFIX_PATH=$QT_LINUX\;$KIRIGAMI_BUILD\;$QXMPP_BUILD \
-DI18N=1 \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr \
-DQUICK_COMPILER=1
-DQUICK_COMPILER=ON -DAPPIMAGE=ON
make -j$(nproc)
}
......
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