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

Merge PR #260: Fix webserver public folder configuration

Browse Source
This commit is contained in:
Jenkins nymea 2019-11-13 13:31:02 +01:00
commit f1abf30689
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-app-core/configuration/serverconfiguration.h
View File

@ -50,7 +50,7 @@ private:
class WebServerConfiguration: public ServerConfiguration class WebServerConfiguration: public ServerConfiguration
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString publicFolder READ publicFolder NOTIFY publicFolderChanged) Q_PROPERTY(QString publicFolder READ publicFolder WRITE setPublicFolder NOTIFY publicFolderChanged)
public: public:
explicit WebServerConfiguration(const QString &id, const QHostAddress &address = QHostAddress(), int port = 0, bool authEnabled = false, bool sslEnabled = false, QObject *parent = nullptr) explicit WebServerConfiguration(const QString &id, const QHostAddress &address = QHostAddress(), int port = 0, bool authEnabled = false, bool sslEnabled = false, QObject *parent = nullptr)
: ServerConfiguration(id, address, port, authEnabled, sslEnabled, parent) {} : ServerConfiguration(id, address, port, authEnabled, sslEnabled, parent) {}

1
nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml
View File

@ -123,7 +123,6 @@ DeviceListPageBase {
Item { Item {
Layout.preferredWidth: shutterControls.implicitWidth Layout.preferredWidth: shutterControls.implicitWidth
Layout.preferredHeight: app.iconSize * 2 Layout.preferredHeight: app.iconSize * 2
Rectangle { anchors.fill: parent; color: "green"; opacity: .3 }
ShutterControls { ShutterControls {
id: shutterControls id: shutterControls
height: parent.height height: parent.height