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
e80719ed
Commit
e80719ed
authored
11 years ago
by
Pierre Rossi
Browse files
Options
Download
Patches
Plain Diff
Use QUrl::fromUserInput in the QtQuick view
parent
8dd8e0e5
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/example.pro
+3
-0
example/example.pro
example/quickwindow.cpp
+22
-0
example/quickwindow.cpp
example/quickwindow.qml
+1
-1
example/quickwindow.qml
lib/qquickwebcontentsview.cpp
+1
-4
lib/qquickwebcontentsview.cpp
with
27 additions
and
5 deletions
example/example.pro
+
3
−
0
View file @
e80719ed
...
@@ -4,6 +4,8 @@ TARGET = example
...
@@ -4,6 +4,8 @@ TARGET = example
HEADERS
=
quickwindow
.
h
widgetwindow
.
h
HEADERS
=
quickwindow
.
h
widgetwindow
.
h
SOURCES
=
quickwindow
.
cpp
widgetwindow
.
cpp
main
.
cpp
SOURCES
=
quickwindow
.
cpp
widgetwindow
.
cpp
main
.
cpp
OTHER_FILES
+=
quickwindow
.
qml
INCLUDEPATH
+=
..
/
lib
INCLUDEPATH
+=
..
/
lib
LIBPATH
=
$$
getOutDir
()
/
$$
getConfigDir
()
/
lib
LIBPATH
=
$$
getOutDir
()
/
$$
getConfigDir
()
/
lib
...
@@ -13,3 +15,4 @@ QMAKE_RPATHDIR += $$LIBPATH
...
@@ -13,3 +15,4 @@ QMAKE_RPATHDIR += $$LIBPATH
QT
+=
widgets
quick
QT
+=
widgets
quick
MOC_DIR
=
$$
PWD
MOC_DIR
=
$$
PWD
This diff is collapsed.
Click to expand it.
example/quickwindow.cpp
+
22
−
0
View file @
e80719ed
...
@@ -41,8 +41,30 @@
...
@@ -41,8 +41,30 @@
#include
"quickwindow.h"
#include
"quickwindow.h"
#include
<QFileInfo>
#include
<QObject>
#include
<QQmlContext>
#include
<QQmlEngine>
#include
<QUrl>
class
Utils
:
public
QObject
{
Q_OBJECT
public:
Utils
(
QObject
*
parent
=
0
)
:
QObject
(
parent
)
{
}
Q_INVOKABLE
static
QUrl
fromUserInput
(
const
QString
&
userInput
)
{
QFileInfo
fileInfo
(
userInput
);
if
(
fileInfo
.
exists
())
return
QUrl
(
fileInfo
.
absoluteFilePath
());
return
QUrl
::
fromUserInput
(
userInput
);
}
};
#include
"quickwindow.moc"
QuickWindow
::
QuickWindow
()
QuickWindow
::
QuickWindow
()
{
{
engine
()
->
rootContext
()
->
setContextProperty
(
"utils"
,
new
Utils
(
this
));
setSource
(
QUrl
(
"example/quickwindow.qml"
));
setSource
(
QUrl
(
"example/quickwindow.qml"
));
setResizeMode
(
QQuickView
::
SizeRootObjectToView
);
setResizeMode
(
QQuickView
::
SizeRootObjectToView
);
setTitle
(
"QQuick Example"
);
setTitle
(
"QQuick Example"
);
...
...
This diff is collapsed.
Click to expand it.
example/quickwindow.qml
+
1
−
1
View file @
e80719ed
...
@@ -72,7 +72,7 @@ Item {
...
@@ -72,7 +72,7 @@ Item {
selectByMouse
:
true
selectByMouse
:
true
onAccepted
:
{
onAccepted
:
{
webContentsView
.
url
=
text
webContentsView
.
url
=
utils
.
fromUserInput
(
text
)
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/qquickwebcontentsview.cpp
+
1
−
4
View file @
e80719ed
...
@@ -81,10 +81,7 @@ QUrl QQuickWebContentsView::url() const
...
@@ -81,10 +81,7 @@ QUrl QQuickWebContentsView::url() const
void
QQuickWebContentsView
::
setUrl
(
const
QUrl
&
url
)
void
QQuickWebContentsView
::
setUrl
(
const
QUrl
&
url
)
{
{
QString
urlString
=
url
.
toString
();
GURL
gurl
(
url
.
toString
().
toStdString
());
GURL
gurl
(
urlString
.
toStdString
());
if
(
!
gurl
.
has_scheme
())
gurl
=
GURL
(
std
::
string
(
"http://"
)
+
urlString
.
toStdString
());
content
::
NavigationController
::
LoadURLParams
params
(
gurl
);
content
::
NavigationController
::
LoadURLParams
params
(
gurl
);
params
.
transition_type
=
content
::
PageTransitionFromInt
(
content
::
PAGE_TRANSITION_TYPED
|
content
::
PAGE_TRANSITION_FROM_ADDRESS_BAR
);
params
.
transition_type
=
content
::
PageTransitionFromInt
(
content
::
PAGE_TRANSITION_TYPED
|
content
::
PAGE_TRANSITION_FROM_ADDRESS_BAR
);
...
...
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