ios fixes

This commit is contained in:
pokamest 2021-09-15 08:03:28 -07:00
parent 12b079df65
commit 9ae2e3fba2
28 changed files with 149639 additions and 39 deletions

View file

@ -24,7 +24,7 @@ win32 {
}
}
macx {
macx:!ios {
message("macOS build")
INCLUDEPATH += $$PWD/macos
HEADERS += $$PWD/macos/botan_all.h
@ -51,3 +51,9 @@ android {
}
}
ios: {
message("ios build")
INCLUDEPATH += $$PWD/ios
HEADERS += $$PWD/ios/botan_all.h
SOURCES += $$PWD/ios/botan_all.cpp
}

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -32,6 +32,18 @@
#define SSH_GLOBAL_H
#include <QtGlobal>
#include <QObject>
#ifdef Q_OS_IOS
class QProcess {
public:
QProcess(QObject *){}
enum ProcessChannel {
StandardOutput,
StandardError
};
};
#endif
#ifdef _MSC_VER
// For static cmake building removing dll export/import

View file

@ -39,6 +39,7 @@
#include <QPair>
#include <QProcess>
namespace QSsh {
class SshRemoteProcess;

View file

@ -46,6 +46,7 @@ SshX11InfoRetriever::SshX11InfoRetriever(const QString &displayName, QObject *pa
m_xauthProc(new QProcess(this)),
m_xauthFile(new QTemporaryFile(this))
{
#ifndef Q_OS_IOS
connect(m_xauthProc, &QProcess::errorOccurred, this,
[this] {
if (m_xauthProc->error() == QProcess::FailedToStart) {
@ -133,10 +134,12 @@ SshX11InfoRetriever::SshX11InfoRetriever(const QString &displayName, QObject *pa
}
}
);
#endif
}
void SshX11InfoRetriever::start()
{
#ifndef Q_OS_IOS
if (!m_xauthFile->open()) {
emitFailure(tr("Could not create temporary file: %1").arg(m_xauthFile->errorString()));
return;
@ -147,6 +150,7 @@ void SshX11InfoRetriever::start()
m_xauthFile->fileName(),
QStringLiteral("generate"),
m_displayName, QString::fromLatin1(xauthProtocol())});
#endif
}
void SshX11InfoRetriever::emitFailure(const QString &reason)