Verified Commit 614baa2d authored by Jonah Brüchert's avatar Jonah Brüchert 🌳

Fix Qt 5.12 compatiblity

Previously it caused issue #378. As soon as support for Qt 5.12 is dropped, we should revert this commit.

Fixes #378
parent db4d73da
Pipeline #25386 passed with stages
in 14 minutes and 39 seconds
......@@ -249,9 +249,9 @@ Kaidan::PasswordVisibility Kaidan::passwordVisibility() const
.value<Kaidan::PasswordVisibility>();
}
ClientWorker::ConnectionError Kaidan::connectionError() const
quint8 Kaidan::connectionError() const
{
return m_connectionError;
return quint8(m_connectionError);
}
void Kaidan::addOpenUri(const QString &uri)
......
......@@ -64,8 +64,8 @@ class Kaidan : public QObject
Q_PROPERTY(TransferCache* transferCache READ transferCache CONSTANT)
Q_PROPERTY(ServerFeaturesCache* serverFeaturesCache READ serverFeaturesCache CONSTANT)
Q_PROPERTY(QSettings* settings READ settings CONSTANT)
Q_PROPERTY(Enums::ConnectionState connectionState READ connectionState NOTIFY connectionStateChanged)
Q_PROPERTY(ClientWorker::ConnectionError connectionError READ connectionError NOTIFY connectionErrorChanged)
Q_PROPERTY(quint8 connectionState READ connectionState NOTIFY connectionStateChanged)
Q_PROPERTY(quint8 connectionError READ connectionError NOTIFY connectionErrorChanged)
Q_PROPERTY(QString jid READ jid WRITE setJid NOTIFY jidChanged)
Q_PROPERTY(QString jidResourcePrefix READ jidResourcePrefix WRITE setJidResourcePrefix NOTIFY jidResourcePrefixChanged)
Q_PROPERTY(QString password READ password WRITE setPassword NOTIFY passwordChanged)
......@@ -115,15 +115,15 @@ public:
/**
* Returns the current ConnectionState
*/
Enums::ConnectionState connectionState() const
quint8 connectionState() const
{
return m_connectionState;
return quint8(m_connectionState);
}
/**
* Returns the last connection error.
*/
ClientWorker::ConnectionError connectionError() const;
quint8 connectionError() const;
/**
* Set own JID used for connection
......
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