Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtWebEngine
Commits
8736ce7b
Commit
8736ce7b
authored
11 years ago
by
Zeno Albisser
Browse files
Options
Download
Patches
Plain Diff
remove blinqpage
parent
db4b7526
dev
0.9
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.15.3
5.15.4
5.15.5
5.15.6
5.15.7
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.2
6.2.0
6.2.1
6.2.2
wip/47-based
wip/qtpdf
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v0.1.0-tp1
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
example/main.cpp
+0
-4
example/main.cpp
lib/blinqpage.cpp
+0
-130
lib/blinqpage.cpp
lib/blinqpage.h
+0
-64
lib/blinqpage.h
lib/lib.pro
+0
-2
lib/lib.pro
with
0 additions
and
200 deletions
example/main.cpp
+
0
−
4
View file @
8736ce7b
...
...
@@ -42,16 +42,12 @@
#include
<QtWidgets>
#include
<blinqapplication.h>
#include
<blinqpage.h>
int
main
(
int
argc
,
char
**
argv
)
{
printf
(
"main called
\n
"
);
BlinqApplication
app
(
argc
,
argv
);
BlinqPage
page
;
// page.window()->show();
return
app
.
exec
();
}
This diff is collapsed.
Click to expand it.
lib/blinqpage.cpp
deleted
100644 → 0
+
0
−
130
View file @
db4b7526
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtWebEngine module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include
"blinqpage.h"
// Needed to get access to content::GetContentClient()
#define CONTENT_IMPLEMENTATION
#include
"content/public/browser/web_contents.h"
#include
"content/public/browser/notification_service.h"
#include
"content/public/browser/web_contents_view.h"
#include
"net/url_request/url_request_context_getter.h"
#include
"base/event_types.h"
#include
"ui/gfx/insets.h"
#include
"ui/gfx/screen.h"
#include
"ui/gfx/rect.h"
#include
"ui/gfx/rect_conversions.h"
#include
"ui/surface/transport_dib.h"
#include
"content/common/view_messages.h"
#include
"content/browser/web_contents/web_contents_impl.h"
#include
"content/browser/renderer_host/render_view_host_factory.h"
#include
"content/browser/renderer_host/render_view_host_impl.h"
#include
"content/browser/renderer_host/backing_store.h"
#include
"skia/ext/platform_canvas.h"
#include
"backing_store_qt.h"
#include
"browser_context_qt.h"
#include
"content_browser_client_qt.h"
#include
"raster_window.h"
#include
"render_widget_host_view_qt.h"
#include
"resource_context_qt.h"
#include
<QByteArray>
#include
<QWindow>
#include
<QCoreApplication>
#include
<QGuiApplication>
#include
<qpa/qplatformwindow.h>
#include
<QLabel>
#include
<QPainter>
#include
<qpa/qplatformnativeinterface.h>
namespace
{
class
RenderViewHost
:
public
content
::
RenderViewHostImpl
{
public:
RenderViewHost
(
content
::
SiteInstance
*
instance
,
content
::
RenderViewHostDelegate
*
delegate
,
content
::
RenderWidgetHostDelegate
*
widget_delegate
,
int
routing_id
,
int
main_frame_routing_id
,
bool
swapped_out
,
content
::
SessionStorageNamespace
*
session_storage_namespace
)
:
content
::
RenderViewHostImpl
(
instance
,
delegate
,
widget_delegate
,
routing_id
,
main_frame_routing_id
,
swapped_out
,
session_storage_namespace
)
{
SetView
(
new
content
::
RenderWidgetHostViewQt
(
this
));
}
};
}
class
BlinqPagePrivate
{
public:
scoped_ptr
<
content
::
BrowserContext
>
context
;
scoped_ptr
<
content
::
WebContents
>
contents
;
};
BlinqPage
::
BlinqPage
()
{
d
.
reset
(
new
BlinqPagePrivate
);
d
->
context
.
reset
(
static_cast
<
ContentBrowserClientQt
*>
(
content
::
GetContentClient
()
->
browser
())
->
browser_context
());
content
::
WebContents
::
CreateParams
p
(
d
->
context
.
get
());
// d->contents.reset(content::WebContents::Create(p));
// d->contents->GetController().LoadURL(GURL(std::string("http://qt-project.org/")),
// content::Referrer(),
// content::PAGE_TRANSITION_TYPED,
// std::string());
}
BlinqPage
::~
BlinqPage
()
{
}
QWindow
*
BlinqPage
::
window
()
{
return
0
;
}
This diff is collapsed.
Click to expand it.
lib/blinqpage.h
deleted
100644 → 0
+
0
−
64
View file @
db4b7526
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtWebEngine module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef BLINQPAGE_H
#define BLINQPAGE_H
#include
<QObject>
#include
<QScopedPointer>
class
QWindow
;
class
BlinqPagePrivate
;
class
Q_DECL_EXPORT
BlinqPage
{
public:
BlinqPage
();
~
BlinqPage
();
QWindow
*
window
();
private:
QScopedPointer
<
BlinqPagePrivate
>
d
;
};
#endif // BLINQPAGE_H
This diff is collapsed.
Click to expand it.
lib/lib.pro
+
0
−
2
View file @
8736ce7b
...
...
@@ -21,7 +21,6 @@ QT += gui-private widgets qml quick
SOURCES
=
\
backing_store_qt
.
cpp
\
blinqapplication
.
cpp
\
blinqpage
.
cpp
\
content_browser_client_qt
.
cpp
\
render_widget_host_view_qt
.
cpp
\
resource_context_qt
.
cpp
\
...
...
@@ -33,7 +32,6 @@ SOURCES = \
HEADERS
=
\
backing_store_qt
.
h
\
blinqapplication
.
h
\
blinqpage
.
h
\
browser_context_qt
.
h
\
content_browser_client_qt
.
h
\
render_widget_host_view_qt
.
h
\
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets