diff --git a/libguh-core/guhconfiguration.cpp b/libguh-core/guhconfiguration.cpp index da24930a..4f2bc580 100644 --- a/libguh-core/guhconfiguration.cpp +++ b/libguh-core/guhconfiguration.cpp @@ -409,10 +409,10 @@ WebServerConfiguration GuhConfiguration::readWebServerConfig(const QString &id) QDebug operator <<(QDebug debug, const ServerConfiguration &configuration) { - debug.noquote().nospace() << "ServerConfiguration(" << configuration.address; - debug.noquote().nospace() << ", " << configuration.id; - debug.noquote().nospace() << ", " << QString("%1:%2").arg(configuration.address.toString()).arg(configuration.port); - debug.noquote().nospace() << ") "; + debug.nospace() << "ServerConfiguration(" << configuration.address; + debug.nospace() << ", " << configuration.id; + debug.nospace() << ", " << QString("%1:%2").arg(configuration.address.toString()).arg(configuration.port); + debug.nospace() << ") "; return debug; } diff --git a/libguh-core/servermanager.cpp b/libguh-core/servermanager.cpp index 66f7239f..ddf22783 100644 --- a/libguh-core/servermanager.cpp +++ b/libguh-core/servermanager.cpp @@ -80,7 +80,9 @@ ServerManager::ServerManager(GuhConfiguration* configuration, QObject *parent) : } } 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.setLocalCertificate(m_certificate); } diff --git a/libguh/devicemanager.cpp b/libguh/devicemanager.cpp index 76b7dd38..aab0e63a 100644 --- a/libguh/devicemanager.cpp +++ b/libguh/devicemanager.cpp @@ -1420,7 +1420,7 @@ void DeviceManager::onLoaded() emit loaded(); // schedule some housekeeping... - QTimer::singleShot(0, this, &DeviceManager::cleanupDeviceStateCache); + QTimer::singleShot(0, this, SLOT(cleanupDeviceStateCache())); } void DeviceManager::cleanupDeviceStateCache() diff --git a/libguh/network/avahi/qtavahiservice.h b/libguh/network/avahi/qtavahiservice.h index 8b6b33fc..a6fd5033 100644 --- a/libguh/network/avahi/qtavahiservice.h +++ b/libguh/network/avahi/qtavahiservice.h @@ -44,7 +44,6 @@ public: QtAvahiServiceStateCollision = 3, QtAvahiServiceStateFailure = 4 }; - Q_ENUM(QtAvahiServiceState) explicit QtAvahiService(QObject *parent = 0); ~QtAvahiService();