diff options
author | aavit <eirik.aavitsland@digia.com> | 2014-10-15 11:45:42 +0200 |
---|---|---|
committer | aavit <eirik.aavitsland@digia.com> | 2014-10-15 11:48:13 +0200 |
commit | 04374090fb5d5b5f57d7c15860635c4df27e26da (patch) | |
tree | 132fc7e8606ce33ec1ee422928d45919120859af /basicsuite/sensors | |
parent | dc12a6624b5f5a397e590d378bcf1f2a2f192e51 (diff) | |
parent | 11ea1829a7057531be95c188fee081a20a7e21c3 (diff) |
Merge branch 'stable' into dev
Change-Id: I0ff4fb4cb9acd73db397bc44c2970a7286a2d0c2
Diffstat (limited to 'basicsuite/sensors')
-rw-r--r-- | basicsuite/sensors/Accelbubble.qml | 2 | ||||
-rw-r--r-- | basicsuite/sensors/Light.qml | 2 | ||||
-rw-r--r-- | basicsuite/sensors/main.qml | 2 | ||||
-rw-r--r-- | basicsuite/sensors/preview_l.jpg | bin | 16715 -> 43733 bytes |
4 files changed, 3 insertions, 3 deletions
diff --git a/basicsuite/sensors/Accelbubble.qml b/basicsuite/sensors/Accelbubble.qml index fa42770..cff693b 100644 --- a/basicsuite/sensors/Accelbubble.qml +++ b/basicsuite/sensors/Accelbubble.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/basicsuite/sensors/Light.qml b/basicsuite/sensors/Light.qml index 24f3bd9..c92dabc 100644 --- a/basicsuite/sensors/Light.qml +++ b/basicsuite/sensors/Light.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/basicsuite/sensors/main.qml b/basicsuite/sensors/main.qml index d6e0e9d..71af99d 100644 --- a/basicsuite/sensors/main.qml +++ b/basicsuite/sensors/main.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/basicsuite/sensors/preview_l.jpg b/basicsuite/sensors/preview_l.jpg Binary files differindex d87d757..9d0d88c 100644 --- a/basicsuite/sensors/preview_l.jpg +++ b/basicsuite/sensors/preview_l.jpg |