From 46bf07baaee9520c8128f7602b16ef33b7694bec Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 14 Jan 2016 12:04:50 +0100 Subject: Fix namespaced build of markdowneditor example Change-Id: Iff50511b06962d02e2a69ee47f1f0df82425dc2d Reviewed-by: Allan Sandfeld Jensen --- examples/webenginewidgets/markdowneditor/mainwindow.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples') diff --git a/examples/webenginewidgets/markdowneditor/mainwindow.h b/examples/webenginewidgets/markdowneditor/mainwindow.h index 6099f1f79..c065fa685 100644 --- a/examples/webenginewidgets/markdowneditor/mainwindow.h +++ b/examples/webenginewidgets/markdowneditor/mainwindow.h @@ -47,9 +47,11 @@ #include #include +QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; } +QT_END_NAMESPACE class MainWindow : public QMainWindow { -- cgit v1.2.3 From a3906aac584aace90c0dd763c9b66b6a8a315ca6 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 8 Jan 2016 14:13:02 +0100 Subject: Update logo of demobrowser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I26b907d943ebd424087c54465608598aaf0d0013 Reviewed-by: Michal Klocek Reviewed-by: Michael BrĂ¼ning --- .../demobrowser/data/demobrowser.svg | 430 ++------------------- .../webenginewidgets/demobrowser/demobrowser.icns | Bin 50218 -> 31513 bytes .../webenginewidgets/demobrowser/demobrowser.ico | Bin 15374 -> 82726 bytes 3 files changed, 22 insertions(+), 408 deletions(-) (limited to 'examples') diff --git a/examples/webenginewidgets/demobrowser/data/demobrowser.svg b/examples/webenginewidgets/demobrowser/data/demobrowser.svg index f61a54c67..9f39deb66 100644 --- a/examples/webenginewidgets/demobrowser/data/demobrowser.svg +++ b/examples/webenginewidgets/demobrowser/data/demobrowser.svg @@ -1,410 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Qt Browser - - - Jens Bache-Wiig - - - - - Copyright (C) 2015 The Qt Company Ltd. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - diff --git a/examples/webenginewidgets/demobrowser/demobrowser.icns b/examples/webenginewidgets/demobrowser/demobrowser.icns index f591ae48a..f24ac6ee7 100644 Binary files a/examples/webenginewidgets/demobrowser/demobrowser.icns and b/examples/webenginewidgets/demobrowser/demobrowser.icns differ diff --git a/examples/webenginewidgets/demobrowser/demobrowser.ico b/examples/webenginewidgets/demobrowser/demobrowser.ico index 7f9be934d..d197d0358 100644 Binary files a/examples/webenginewidgets/demobrowser/demobrowser.ico and b/examples/webenginewidgets/demobrowser/demobrowser.ico differ -- cgit v1.2.3