Code Review / staging / HomeScreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 113977c)
Compilation flag to avoid compil errors on ubuntu sandbox/jobol/forgerock
authorJosé Bollo <jose.bollo@iot.bzh>
Fri, 16 Dec 2016 08:54:44 +0000 (09:54 +0100)
committerJosé Bollo <jose.bollo@iot.bzh>
Wed, 21 Dec 2016 14:28:41 +0000 (15:28 +0100)
Change-Id: I9efc077fe86fba50873d724682d02fa11df40980
Signed-off-by: Philippe Lelong <lelong.ph@meltemus.com>
HomeScreen/qml/main.qml patch | blob | history
HomeScreen/src2/usermanagement.h patch | blob | history

diff --git a/HomeScreen/qml/main.qml b/HomeScreen/qml/main.qml
index c97702d..4a44f4c 100644 (file)
--- a/HomeScreen/qml/main.qml
+++ b/HomeScreen/qml/main.qml
@@ -36,7 +36,7 @@ Window {
         anchors.centerIn: parent
         width: 1080
         height: 1920
-        scale: 1
+        scale: 0.5
         source: './images/AGL_HMI_Background_NoCar-01.png'
 
         ColumnLayout {
diff --git a/HomeScreen/src2/usermanagement.h b/HomeScreen/src2/usermanagement.h
index 32db93f..c3a41bc 100644 (file)
--- a/HomeScreen/src2/usermanagement.h
+++ b/HomeScreen/src2/usermanagement.h
@@ -1,7 +1,7 @@
 #ifndef USERMANAGEMENT_H
 #define USERMANAGEMENT_H
 
-#define REAL_SERVER "ws://localhost:1212/api?token=hello"
+//#define REAL_SERVER "ws://localhost:1212/api?token=hello"
 
 #include <QObject>
 #include "applicationmodel.h"