From 92c8d6836b73037247de671a9c8c604d2f4e900a Mon Sep 17 00:00:00 2001 From: Michael Schuster Date: Thu, 18 Jun 2020 21:05:11 +0200 Subject: [PATCH] Fix libsync exports for proxy changes in #1886 Build failed on Windows, missing libsync export for printQNetworkProxy after moving ClientProxy class from gui to libsync. Signed-off-by: Michael Schuster --- src/gui/connectionvalidator.cpp | 2 +- src/gui/owncloudsetupwizard.cpp | 2 +- src/libsync/clientproxy.cpp | 4 ++-- src/libsync/clientproxy.h | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp index eab6479da..706171959 100644 --- a/src/gui/connectionvalidator.cpp +++ b/src/gui/connectionvalidator.cpp @@ -76,7 +76,7 @@ void ConnectionValidator::systemProxyLookupDone(const QNetworkProxy &proxy) } if (proxy.type() != QNetworkProxy::NoProxy) { - qCInfo(lcConnectionValidator) << "Setting QNAM proxy to be system proxy" << printQNetworkProxy(proxy); + qCInfo(lcConnectionValidator) << "Setting QNAM proxy to be system proxy" << ClientProxy::printQNetworkProxy(proxy); } else { qCInfo(lcConnectionValidator) << "No system proxy set by OS"; } diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index 4aff80956..1a8762e04 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -170,7 +170,7 @@ void OwncloudSetupWizard::slotCheckServer(const QString &urlString) void OwncloudSetupWizard::slotSystemProxyLookupDone(const QNetworkProxy &proxy) { if (proxy.type() != QNetworkProxy::NoProxy) { - qCInfo(lcWizard) << "Setting QNAM proxy to be system proxy" << printQNetworkProxy(proxy); + qCInfo(lcWizard) << "Setting QNAM proxy to be system proxy" << ClientProxy::printQNetworkProxy(proxy); } else { qCInfo(lcWizard) << "No system proxy set by OS"; } diff --git a/src/libsync/clientproxy.cpp b/src/libsync/clientproxy.cpp index 92fb2ab29..2deba9d54 100644 --- a/src/libsync/clientproxy.cpp +++ b/src/libsync/clientproxy.cpp @@ -56,7 +56,7 @@ bool ClientProxy::isUsingSystemDefault() return true; } -const char *proxyTypeToCStr(QNetworkProxy::ProxyType type) +const char *ClientProxy::proxyTypeToCStr(QNetworkProxy::ProxyType type) { switch (type) { case QNetworkProxy::NoProxy: @@ -76,7 +76,7 @@ const char *proxyTypeToCStr(QNetworkProxy::ProxyType type) } } -QString printQNetworkProxy(const QNetworkProxy &proxy) +QString ClientProxy::printQNetworkProxy(const QNetworkProxy &proxy) { return QString("%1://%2:%3").arg(proxyTypeToCStr(proxy.type())).arg(proxy.hostName()).arg(proxy.port()); } diff --git a/src/libsync/clientproxy.h b/src/libsync/clientproxy.h index 0363ae466..77c1ee804 100644 --- a/src/libsync/clientproxy.h +++ b/src/libsync/clientproxy.h @@ -41,6 +41,9 @@ public: static bool isUsingSystemDefault(); static void lookupSystemProxyAsync(const QUrl &url, QObject *dst, const char *slot); + static QString printQNetworkProxy(const QNetworkProxy &proxy); + static const char *proxyTypeToCStr(QNetworkProxy::ProxyType type); + public slots: void setupQtProxyFromConfig(); }; @@ -58,7 +61,6 @@ private: QUrl _url; }; -QString printQNetworkProxy(const QNetworkProxy &proxy); } #endif // CLIENTPROXY_H