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/webengine | |
parent | dc12a6624b5f5a397e590d378bcf1f2a2f192e51 (diff) | |
parent | 11ea1829a7057531be95c188fee081a20a7e21c3 (diff) |
Merge branch 'stable' into dev
Change-Id: I0ff4fb4cb9acd73db397bc44c2970a7286a2d0c2
Diffstat (limited to 'basicsuite/webengine')
-rw-r--r-- | basicsuite/webengine/content/index.html | 2 | ||||
-rw-r--r-- | basicsuite/webengine/main.qml | 2 | ||||
-rw-r--r-- | basicsuite/webengine/preview_l.jpg | bin | 18081 -> 66408 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/basicsuite/webengine/content/index.html b/basicsuite/webengine/content/index.html index fda8caa..98c6df3 100644 --- a/basicsuite/webengine/content/index.html +++ b/basicsuite/webengine/content/index.html @@ -25,7 +25,7 @@ </head> <body bgcolor="#AAAAAA"> <div style="text-align: center; padding-top: 100px;"> - <div class="bookmark"><a href="http://qt.digia.com">http://qt.digia.com</a></div> + <div class="bookmark"><a href="http://www.qt.io">http://www.qt.io</a></div> <div class="bookmark"><a href="http://qt-project.org/doc/qt-5">http://qt-project.org/doc/qt-5</a></div> <div class="bookmark"><a href="http://www.google.com">http://www.google.com</a></div> <!-- <div class="example"><a href="../content/webgl/helloqt.html"><img class="example_image" src="../content/webgl/screenshot.png"></a></div> --> diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml index 39ac91d..d0b58c9 100644 --- a/basicsuite/webengine/main.qml +++ b/basicsuite/webengine/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/webengine/preview_l.jpg b/basicsuite/webengine/preview_l.jpg Binary files differindex 963258a..9474ed3 100644 --- a/basicsuite/webengine/preview_l.jpg +++ b/basicsuite/webengine/preview_l.jpg |