From 23f035b4975ddd31a5b0a193a4d4dba705c99e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Fri, 16 May 2014 12:08:50 +0200 Subject: Remove the webpage snippet for now. This snippet contains API that we might not support at all. It is better to remove it and add a new version in case we reintroduce this than to present a snippet that does not work or only works partially. Change-Id: Ia47ad69108ddcbe529aecff8e4f235b17d80514f Reviewed-by: Jocelyn Turcotte --- src/webenginewidgets/doc/snippets/webpage/main.cpp | 82 ---------------------- .../doc/snippets/webpage/webpage.pro | 3 - .../doc/src/qwebenginepage_lgpl.qdoc | 30 -------- 3 files changed, 115 deletions(-) delete mode 100644 src/webenginewidgets/doc/snippets/webpage/main.cpp delete mode 100644 src/webenginewidgets/doc/snippets/webpage/webpage.pro (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/doc/snippets/webpage/main.cpp b/src/webenginewidgets/doc/snippets/webpage/main.cpp deleted file mode 100644 index daeed2bc6..000000000 --- a/src/webenginewidgets/doc/snippets/webpage/main.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/* - Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include -#include -#include -#include - -//! [0] -class Thumbnailer : public QObject -{ - Q_OBJECT - -public: - Thumbnailer(const QUrl &url); - -Q_SIGNALS: - void finished(); - -private Q_SLOTS: - void render(); - -private: - QWebPage page; - -}; -//! [0] - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - - Thumbnailer thumbnail(QUrl("http://qt.nokia.com")); - - QObject::connect(&thumbnail, SIGNAL(finished()), - &app, SLOT(quit())); - - return app.exec(); -} - -//! [1] -Thumbnailer::Thumbnailer(const QUrl &url) -{ - page.mainFrame()->load(url); - connect(&page, SIGNAL(loadFinished(bool)), - this, SLOT(render())); -} -//! [1] - -//! [2] -void Thumbnailer::render() -{ - page.setViewportSize(page.mainFrame()->contentsSize()); - QImage image(page.viewportSize(), QImage::Format_ARGB32); - QPainter painter(&image); - - page.mainFrame()->render(&painter); - painter.end(); - - QImage thumbnail = image.scaled(400, 400); - thumbnail.save("thumbnail.png"); - - emit finished(); -} -//! [2] -#include "main.moc" diff --git a/src/webenginewidgets/doc/snippets/webpage/webpage.pro b/src/webenginewidgets/doc/snippets/webpage/webpage.pro deleted file mode 100644 index 8d9c6938e..000000000 --- a/src/webenginewidgets/doc/snippets/webpage/webpage.pro +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG += console -QT += webkitwidgets -SOURCES = main.cpp diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 538df9513..aa397e018 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -69,36 +69,6 @@ Its argument, either true or false, indicates whether or not the load operation succeeded. */ -// FIXME: This part is commented out for the time being until we decide if and how -// the functionality to render a page onto a painter will be reintroduced or not. -// -// \section1 Using QWebEnginePage in a Widget-less Environment -// -// Before you begin painting a QWebEnginePage object, you need to set the size of -// the viewport by calling setViewportSize(). Then, you invoke the main -// frame's render function (QWebEnginePage::render()). An example of this -// is shown in the code snippet below. -// -// Suppose we have a \c Thumbnail class as follows: -// -// \snippet snippets/webpage/main.cpp 0 -// -// The \c Thumbnail's constructor takes in a \a url. We connect our QWebEnginePage -// object's \l{QWebEnginePage::}{loadFinished()} signal to our private slot, -// \c render(). -// -// \snippet snippets/webpage/main.cpp 1 -// -// The \c render() function shows how we can paint a thumbnail using a -// QWebEnginePage object. -// -// \snippet snippets/webpage/main.cpp 2 -// -// We begin by setting the \l{QWebEnginePage::viewportSize()}{viewportSize} and -// then we instantiate a QImage object, \c image, with the same size as our -// \l{QWebEnginePage::viewportSize()}{viewportSize}. This image is then sent -// as a parameter to \c painter. Next, we render the contents of the main -// frame and its subframes into \c painter. Finally, we save the scaled image. /*! \enum QWebEnginePage::FindFlag -- cgit v1.2.3