ios fixes
This commit is contained in:
parent
12b079df65
commit
9ae2e3fba2
28 changed files with 149639 additions and 39 deletions
|
@ -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
|
||||
}
|
||||
|
|
107484
client/3rd/QtSsh/src/botan/ios/botan_all.cpp
Executable file
107484
client/3rd/QtSsh/src/botan/ios/botan_all.cpp
Executable file
File diff suppressed because it is too large
Load diff
42007
client/3rd/QtSsh/src/botan/ios/botan_all.h
Executable file
42007
client/3rd/QtSsh/src/botan/ios/botan_all.h
Executable file
File diff suppressed because it is too large
Load diff
|
@ -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
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
#include <QPair>
|
||||
#include <QProcess>
|
||||
|
||||
|
||||
namespace QSsh {
|
||||
class SshRemoteProcess;
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue