first attempts to build against upstream qxmpp

core/account.h

@@ -42,6 +42,9 @@
 #include <QXmppUploadRequestManager.h>
 #include <QXmppVCardManager.h>
 #include <QXmppMessageReceiptManager.h>
+#ifdef WITH_OMEMO
+#include <QXmppOmemoManager.h>
+#endif
 
 #include <shared/shared.h>
 #include <shared/identity.h>
@@ -176,6 +179,9 @@ private:
     QXmppUploadRequestManager* um;
     QXmppDiscoveryManager* dm;
     QXmppMessageReceiptManager* rcpm;
+#ifdef WITH_OMEMO
+    QXmppOmemoManager* om;
+#endif
     bool reconnectScheduled;
     QTimer* reconnectTimer;