Moving to Qt6:
1) removing of deprecated classes 2) update of IPC mechanism
This commit is contained in:
parent
8191c25dd7
commit
6c614a4b3c
21 changed files with 478 additions and 531 deletions
|
|
@ -1,9 +1,3 @@
|
|||
//#include <QAndroidBinder>
|
||||
//#include <QAndroidIntent>
|
||||
//#include <QAndroidJniEnvironment>
|
||||
//#include <QAndroidJniObject>
|
||||
//#include <QAndroidParcel>
|
||||
//#include <QAndroidServiceConnection>
|
||||
#include <QDebug>
|
||||
#include <QHostAddress>
|
||||
#include <QJsonArray>
|
||||
|
|
@ -12,12 +6,8 @@
|
|||
#include <QRandomGenerator>
|
||||
#include <QTextCodec>
|
||||
#include <QTimer>
|
||||
//#include <QtAndroid>
|
||||
#include <QtCore/private/qandroidextras_p.h>
|
||||
|
||||
|
||||
#include "android_vpnprotocol.h"
|
||||
#include "core/errorstrings.h"
|
||||
|
||||
#include "platforms/android/android_controller.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,11 @@
|
|||
#ifndef ANDROID_VPNPROTOCOL_H
|
||||
#define ANDROID_VPNPROTOCOL_H
|
||||
|
||||
#include <QAndroidBinder>
|
||||
#include <QAndroidServiceConnection>
|
||||
|
||||
#include "vpnprotocol.h"
|
||||
#include "protocols/protocols_defs.h"
|
||||
|
||||
using namespace amnezia;
|
||||
|
||||
|
||||
|
||||
class AndroidVpnProtocol : public VpnProtocol
|
||||
{
|
||||
Q_OBJECT
|
||||
|
|
@ -32,7 +27,6 @@ protected:
|
|||
|
||||
private:
|
||||
Proto m_protocol;
|
||||
|
||||
};
|
||||
|
||||
#endif // ANDROID_VPNPROTOCOL_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue