Merge branch 'qt_migration' of github.com:amnezia-vpn/desktop-client into qmake-to-cmake-migration

This commit is contained in:
vladimir.kuznetsov 2022-12-26 17:29:52 +03:00
commit 030bb8fe76
158 changed files with 9 additions and 11043 deletions

View file

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