diff --git a/README.md b/README.md index 4d5cd364..c9c0d70f 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ a "`qmake` cannot be found in your `$PATH`" error. In this case run this script using QT\IOS\_BIN env to set the path for the Qt5 macos build bin folder. For example, the path could look like this: ```bash -QT_IOS_BIN="/Users/username/Qt/5.15.2/ios/bin" ./scripts/apple_compile.sh ios +QT_IOS_BIN="/Users/username/Qt/6.4.1/ios/bin" ./scripts/apple_compile.sh ios ``` If you get `gomobile: command not found` make sure to set PATH to the location diff --git a/client/3rd/QtSsh/src/ssh/sshconnection.cpp b/client/3rd/QtSsh/src/ssh/sshconnection.cpp index e4403499..62e2b622 100644 --- a/client/3rd/QtSsh/src/ssh/sshconnection.cpp +++ b/client/3rd/QtSsh/src/ssh/sshconnection.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include namespace QSsh { @@ -401,14 +401,14 @@ void SshConnectionPrivate::handleServerId() // "printable US-ASCII characters, with the exception of whitespace characters // and the minus sign" QString legalString = QLatin1String("[]!\"#$!&'()*+,./0-9:;<=>?@A-Z[\\\\^_`a-z{|}~]+"); - const QRegExp versionIdpattern(QString::fromLatin1("SSH-(%1)-%1(?: .+)?.*").arg(legalString)); - if (!versionIdpattern.exactMatch(QString::fromLatin1(m_serverId))) { + const QRegularExpression versionIdpattern(QString::fromLatin1("SSH-(%1)-%1(?: .+)?.*").arg(legalString)); + if (!versionIdpattern.match(QString::fromLatin1(m_serverId)).hasMatch()) { throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR, "Identification string is invalid.", tr("Server Identification string \"%1\" is invalid.") .arg(QString::fromLatin1(m_serverId))); } - const QString serverProtoVersion = versionIdpattern.cap(1); + const QString serverProtoVersion = versionIdpattern.match(QString::fromLatin1(m_serverId)).captured(1); if (serverProtoVersion != QLatin1String("2.0") && serverProtoVersion != QLatin1String("1.99")) { throw SshServerException(SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED, "Invalid protocol version.", diff --git a/client/client.pro b/client/client.pro index 021cf80b..f1c79593 100644 --- a/client/client.pro +++ b/client/client.pro @@ -1,4 +1,4 @@ -QT += widgets core gui network xml remoteobjects quick svg quickcontrols2 +QT += widgets core gui network xml remoteobjects quick svg quickcontrols2 core5compat equals(QT_MAJOR_VERSION, 6): QT += core5compat TARGET = AmneziaVPN @@ -353,7 +353,7 @@ ios { message("Building for iPhone OS") QMAKE_TARGET_BUNDLE_PREFIX = org.amnezia QMAKE_BUNDLE = AmneziaVPN - QMAKE_IOS_DEPLOYMENT_TARGET = 12.0 + QMAKE_IOS_DEPLOYMENT_TARGET = 13.0 QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1 QMAKE_DEVELOPMENT_TEAM = X7UJ388FXK QMAKE_PROVISIONING_PROFILE = f2fefb59-14aa-4aa9-ac14-1d5531b06dcc diff --git a/client/scripts/apple_compile.sh b/client/scripts/apple_compile.sh index fb44af30..48b438bb 100755 --- a/client/scripts/apple_compile.sh +++ b/client/scripts/apple_compile.sh @@ -270,6 +270,6 @@ print G "done." sed -i '' '/Original<\/string>/d' AmneziaVPN.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings fi -# print Y "Opening in XCode..." -# open AmneziaVPN.xcodeproj +print Y "Opening in XCode..." +open AmneziaVPN.xcodeproj print G "All done!" diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp index 6a0b8d20..b64b47e1 100644 --- a/client/ui/uilogic.cpp +++ b/client/ui/uilogic.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include "amnezia_application.h"