diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-06-12 15:29:36 +0200 |
|---|---|---|
| committer | Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com> | 2018-06-12 14:22:13 +0000 |
| commit | e1ffd8c20855b05e5f5db7b1364aead3a90e8046 (patch) | |
| tree | fc1d87c1e550fc8c6602842d3187aa8ae95a443f | |
| parent | 1c2ca99f5bb020a758dfc198f9200528fd33180f (diff) | |
[config] Add a special server.conf for windows
This is needed as on windows clients cannot connect to a server
with the url 0.0.0.0.
On windows we now use a different server.conf using 127.0.0.1
as the url for server and client. This has the limitation that
the android remote app can not connect to a server running on this
localhost only address.
Task-number: AUTOSUITE-546
Change-Id: Ib07406373d533f185dde3f5a38376bf68f289055
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
| -rw-r--r-- | neptune3-ui.pro | 5 | ||||
| -rw-r--r-- | win32/server.conf | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/neptune3-ui.pro b/neptune3-ui.pro index f96bff72..01c75142 100644 --- a/neptune3-ui.pro +++ b/neptune3-ui.pro @@ -26,7 +26,10 @@ SUBDIRS += copydata qml.files = apps dev/apps imports sysui styles am-config.yaml Main.qml qml.path = $$INSTALL_PREFIX/neptune3 INSTALLS += qml -server.files = server.conf + +win32: server.files = win32/server.conf +else: server.files = server.conf + server.path = $$INSTALL_PREFIX/neptune3 INSTALLS += server diff --git a/win32/server.conf b/win32/server.conf new file mode 100644 index 00000000..708e00ee --- /dev/null +++ b/win32/server.conf @@ -0,0 +1,2 @@ +[settings] +Registry=tcp://127.0.0.1:9999 |