Skip to content
Snippets Groups Projects
Commit f5eb41e2 authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Sébastien Blin
Browse files

misc: remove Qt version macros wrapping metatype declarations

We've committed to Qt 5.15 as a minumum requirement for this client
for now.

Gitlab: #581
Change-Id: If3fd6a7bcb4a02dec31ad4e26b41f7650230cc28
parent 2eb16d74
Branches
Tags
No related merge requests found
...@@ -123,6 +123,4 @@ private: ...@@ -123,6 +123,4 @@ private:
QMetaObject::Connection contactAddedConnection_; QMetaObject::Connection contactAddedConnection_;
QMetaObject::Connection addedToConferenceConnection_; QMetaObject::Connection addedToConferenceConnection_;
}; };
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(AccountAdapter *) Q_DECLARE_METATYPE(AccountAdapter *)
#endif
...@@ -94,6 +94,4 @@ signals: ...@@ -94,6 +94,4 @@ signals:
void contactModelChanged(); void contactModelChanged();
void deviceModelChanged(); void deviceModelChanged();
}; };
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(ClientWrapper *) Q_DECLARE_METATYPE(ClientWrapper *)
#endif
...@@ -472,6 +472,4 @@ private: ...@@ -472,6 +472,4 @@ private:
MapStringString contentDrafts_; MapStringString contentDrafts_;
MapStringString lastConferencees_; MapStringString lastConferencees_;
}; };
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(LRCInstance *) Q_DECLARE_METATYPE(LRCInstance *)
#endif
...@@ -277,6 +277,4 @@ private: ...@@ -277,6 +277,4 @@ private:
*/ */
AVModel &avModel_; AVModel &avModel_;
}; };
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(RenderManager *) Q_DECLARE_METATYPE(RenderManager *)
#endif
...@@ -238,6 +238,4 @@ public: ...@@ -238,6 +238,4 @@ public:
Q_INVOKABLE void set_FileUserCert(QString text); Q_INVOKABLE void set_FileUserCert(QString text);
Q_INVOKABLE void set_FilePrivateKey(QString text); Q_INVOKABLE void set_FilePrivateKey(QString text);
}; };
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(SettingsAdaptor *) Q_DECLARE_METATYPE(SettingsAdaptor *)
#endif
...@@ -560,6 +560,4 @@ public: ...@@ -560,6 +560,4 @@ public:
private: private:
QClipboard *clipboard_; QClipboard *clipboard_;
}; };
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
Q_DECLARE_METATYPE(UtilsAdapter *) Q_DECLARE_METATYPE(UtilsAdapter *)
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment