ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix webserver test path

pull/135/head
Simon Stürz 2015-12-10 15:35:20 +01:00 committed by Michael Zanetti
parent ec2abdcd98
commit 6b0b8765eb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/webserver.cpp
View File

@ -80,6 +80,7 @@
#include <QJsonDocument>
#include <QNetworkInterface>
#include <QXmlStreamWriter>
#include <QCoreApplication>
#include <QTcpServer>
#include <QTcpSocket>
#include <QSslSocket>
@ -116,6 +117,11 @@ WebServer::WebServer(const QSslConfiguration &sslConfiguration, QObject *parent)
if (!m_webinterfaceDir.exists())
qCWarning(dcWebServer) << "Web interface public folder" << m_webinterfaceDir.path() << "does not exist.";
if (QCoreApplication::instance()->organizationName() == "guh-test") {
m_webinterfaceDir = QDir(QCoreApplication::applicationDirPath());
qCWarning(dcWebServer) << "Using public folder" << m_webinterfaceDir.path();
}
// check SSL
if (m_useSsl && m_sslConfiguration.isNull())
m_useSsl = false;