ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it build in jessie again

Browse Source
This commit is contained in:
Michael Zanetti 2017-10-07 22:06:42 +02:00
parent 60c7a3c322
commit 7aa6ab2795
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libguh-core/guhconfiguration.cpp
View File

@ -409,10 +409,10 @@ WebServerConfiguration GuhConfiguration::readWebServerConfig(const QString &id)
QDebug operator <<(QDebug debug, const ServerConfiguration &configuration) QDebug operator <<(QDebug debug, const ServerConfiguration &configuration)
{ {
debug.noquote().nospace() << "ServerConfiguration(" << configuration.address; debug.nospace() << "ServerConfiguration(" << configuration.address;
debug.noquote().nospace() << ", " << configuration.id; debug.nospace() << ", " << configuration.id;
debug.noquote().nospace() << ", " << QString("%1:%2").arg(configuration.address.toString()).arg(configuration.port); debug.nospace() << ", " << QString("%1:%2").arg(configuration.address.toString()).arg(configuration.port);
debug.noquote().nospace() << ") "; debug.nospace() << ") ";
return debug; return debug;
} }

4
libguh-core/servermanager.cpp
View File

@ -80,7 +80,9 @@ ServerManager::ServerManager(GuhConfiguration* configuration, QObject *parent) :
} }
} }
if (certsLoaded) { if (certsLoaded) {
m_sslConfiguration.setProtocol(QSsl::TlsV1_1OrLater); // Enable this when we can
// Debian jessie doesn't have better options yet and the client apps currently only support up to TLS 1.1
// m_sslConfiguration.setProtocol(QSsl::TlsV1_1OrLater);
m_sslConfiguration.setPrivateKey(m_certificateKey); m_sslConfiguration.setPrivateKey(m_certificateKey);
m_sslConfiguration.setLocalCertificate(m_certificate); m_sslConfiguration.setLocalCertificate(m_certificate);
} }

2
libguh/devicemanager.cpp
View File

@ -1420,7 +1420,7 @@ void DeviceManager::onLoaded()
emit loaded(); emit loaded();
// schedule some housekeeping... // schedule some housekeeping...
QTimer::singleShot(0, this, &DeviceManager::cleanupDeviceStateCache); QTimer::singleShot(0, this, SLOT(cleanupDeviceStateCache()));
} }
void DeviceManager::cleanupDeviceStateCache() void DeviceManager::cleanupDeviceStateCache()

1
libguh/network/avahi/qtavahiservice.h
View File

@ -44,7 +44,6 @@ public:
QtAvahiServiceStateCollision = 3, QtAvahiServiceStateCollision = 3,
QtAvahiServiceStateFailure = 4 QtAvahiServiceStateFailure = 4
}; };
Q_ENUM(QtAvahiServiceState)
explicit QtAvahiService(QObject *parent = 0); explicit QtAvahiService(QObject *parent = 0);
~QtAvahiService(); ~QtAvahiService();