AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some fixes for Qt6 Android

Browse source
This commit is contained in:
pokamest 2022-08-31 15:18:33 +03:00
parent 33ec69d33a
commit ac74510d47
7 changed files with 59 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/3rd/QtSsh/src/botan/botan.pri
View file

@ -37,6 +37,19 @@ linux-g++ {
} }
android { android {
versionAtLeast(QT_VERSION, 6.0.0) {
# We need to include qtprivate api's
# As QAndroidBinder is not yet implemented with a public api
QT+=core-private
ANDROID_ABIS=ANDROID_TARGET_ARCH
INCLUDEPATH += $$PWD/android/$${ANDROID_TARGET_ARCH}
HEADERS += $$PWD/android/$${ANDROID_TARGET_ARCH}/botan_all.h
SOURCES += $$PWD/android/$${ANDROID_TARGET_ARCH}/botan_all.cpp
}
else {
QT += androidextras
for (abi, ANDROID_ABIS): { for (abi, ANDROID_ABIS): {
equals(ANDROID_TARGET_ARCH,$$abi) { equals(ANDROID_TARGET_ARCH,$$abi) {
INCLUDEPATH += $$PWD/android/$${abi} INCLUDEPATH += $$PWD/android/$${abi}
@ -44,6 +57,7 @@ android {
SOURCES += $$PWD/android/$${abi}/botan_all.cpp SOURCES += $$PWD/android/$${abi}/botan_all.cpp
} }
} }
}
} }
ios: { ios: {

11
client/client.pro
View file

@ -231,7 +231,18 @@ win32|macx|linux:!android {
} }
android { android {
message(Platform: android)
message("$$ANDROID_TARGET_ARCH")
versionAtLeast(QT_VERSION, 6.0.0) {
# We need to include qtprivate api's
# As QAndroidBinder is not yet implemented with a public api
QT+=core-private
ANDROID_ABIS=ANDROID_TARGET_ARCH
}
else {
QT += androidextras QT += androidextras
}
DEFINES += MVPN_ANDROID DEFINES += MVPN_ANDROID
INCLUDEPATH += platforms/android INCLUDEPATH += platforms/android

17
client/platforms/android/android_controller.cpp
View file

@ -1,9 +1,9 @@
#include <QAndroidBinder> //#include <QAndroidBinder>
#include <QAndroidIntent> //#include <QAndroidIntent>
#include <QAndroidJniEnvironment> //#include <QAndroidJniEnvironment>
#include <QAndroidJniObject> //#include <QAndroidJniObject>
#include <QAndroidParcel> //#include <QAndroidParcel>
#include <QAndroidServiceConnection> //#include <QAndroidServiceConnection>
#include <QDebug> #include <QDebug>
#include <QHostAddress> #include <QHostAddress>
#include <QJsonArray> #include <QJsonArray>
@ -12,7 +12,10 @@
#include <QRandomGenerator> #include <QRandomGenerator>
#include <QTextCodec> #include <QTextCodec>
#include <QTimer> #include <QTimer>
#include <QtAndroid> //#include <QtAndroid>
#include <QtCore/private/qandroidextras_p.h>
#include "android_controller.h" #include "android_controller.h"
#include "core/errorstrings.h" #include "core/errorstrings.h"

5
client/platforms/android/android_controller.h
View file

@ -1,8 +1,9 @@
#ifndef ANDROID_CONTROLLER_H #ifndef ANDROID_CONTROLLER_H
#define ANDROID_CONTROLLER_H #define ANDROID_CONTROLLER_H
#include <QAndroidBinder> //#include <QAndroidBinder>
#include <QAndroidServiceConnection> //#include <QAndroidServiceConnection>
#include <QtCore/private/qandroidextras_p.h>
#include "protocols/vpnprotocol.h" #include "protocols/vpnprotocol.h"
using namespace amnezia; using namespace amnezia;

16
client/protocols/android_vpnprotocol.cpp
View file

@ -1,9 +1,9 @@
#include <QAndroidBinder> //#include <QAndroidBinder>
#include <QAndroidIntent> //#include <QAndroidIntent>
#include <QAndroidJniEnvironment> //#include <QAndroidJniEnvironment>
#include <QAndroidJniObject> //#include <QAndroidJniObject>
#include <QAndroidParcel> //#include <QAndroidParcel>
#include <QAndroidServiceConnection> //#include <QAndroidServiceConnection>
#include <QDebug> #include <QDebug>
#include <QHostAddress> #include <QHostAddress>
#include <QJsonArray> #include <QJsonArray>
@ -12,7 +12,9 @@
#include <QRandomGenerator> #include <QRandomGenerator>
#include <QTextCodec> #include <QTextCodec>
#include <QTimer> #include <QTimer>
#include <QtAndroid> //#include <QtAndroid>
#include <QtCore/private/qandroidextras_p.h>
#include "android_vpnprotocol.h" #include "android_vpnprotocol.h"
#include "core/errorstrings.h" #include "core/errorstrings.h"

6
client/ui/qautostart.cpp
View file

@ -123,9 +123,9 @@ void Autostart::setAutostart(bool autostart) {
if (file.open(QIODevice::ReadWrite)) { if (file.open(QIODevice::ReadWrite)) {
QTextStream stream(&file); QTextStream stream(&file);
stream << "[Desktop Entry]" << endl; stream << "[Desktop Entry]" << Qt::endl;
stream << "Exec=" << appPath() << endl; stream << "Exec=" << appPath() << Qt::endl;
stream << "Type=Application" << endl; stream << "Type=Application" << Qt::endl;
} }
} }
} }

2
client/ui/uilogic.cpp
View file

@ -18,7 +18,7 @@
#include <QTimer> #include <QTimer>
#include <QRegularExpression> #include <QRegularExpression>
#include <QQmlFile> #include <QQmlFile>
#include <QStandardPaths>
#include "configurators/cloak_configurator.h" #include "configurators/cloak_configurator.h"
#include "configurators/vpn_configurator.h" #include "configurators/vpn_configurator.h"
#include "configurators/openvpn_configurator.h" #include "configurators/openvpn_configurator.h"