Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
b0f9b1d4
Commit
b0f9b1d4
authored
Apr 28, 2010
by
kh1
Browse files
We need to check for namespace nokia too.
Reviewed-by: ck
parent
2c64aa05
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/help/helpviewer.cpp
View file @
b0f9b1d4
...
...
@@ -44,7 +44,8 @@
using
namespace
Help
::
Internal
;
const
QString
HelpViewer
::
DocPath
=
QLatin1String
(
"qthelp://com.trolltech."
);
const
QString
HelpViewer
::
NsNokia
=
QLatin1String
(
"qthelp://com.nokia."
);
const
QString
HelpViewer
::
NsTrolltech
=
QLatin1String
(
"qthelp://com.trolltech."
);
const
QString
HelpViewer
::
AboutBlankPage
=
QCoreApplication
::
translate
(
"HelpViewer"
,
"<title>about:blank</title>"
);
...
...
src/plugins/help/helpviewer.h
View file @
b0f9b1d4
...
...
@@ -85,7 +85,8 @@ public:
bool
findText
(
const
QString
&
text
,
Find
::
IFindSupport
::
FindFlags
flags
,
bool
incremental
,
bool
fromSearch
);
static
const
QString
DocPath
;
static
const
QString
NsNokia
;
static
const
QString
NsTrolltech
;
static
const
QString
AboutBlankPage
;
static
const
QString
PageNotFoundMessage
;
...
...
src/plugins/help/helpviewer_qwv.cpp
View file @
b0f9b1d4
...
...
@@ -132,7 +132,7 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/,
// html, thus a path inside the css like (../images/foo.png) might cd out of
// the virtual folder
if
(
!
engine
.
findFile
(
url
).
isValid
())
{
if
(
url
.
startsWith
(
HelpViewer
::
DocPat
h
))
{
if
(
url
.
startsWith
(
HelpViewer
::
NsNokia
)
||
url
.
startsWith
(
HelpViewer
::
NsTrolltec
h
))
{
QUrl
newUrl
=
request
.
url
();
if
(
!
newUrl
.
path
().
startsWith
(
QLatin1String
(
"/qdoc/"
)))
{
newUrl
.
setPath
(
QLatin1String
(
"/qdoc/"
)
+
newUrl
.
path
());
...
...
Write
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!
Cancel
Please
register
or
sign in
to comment