feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Extend the CSS workaround in the helpviewer

Browse Source 
The documentation now uses /doc instead of /qdoc.

Change-Id: If01ee02d236cb343f78e0c185a3e05620dac24ae
Reviewed-by: Michael Bruning <michael.bruning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Daniel Molkentin
2012-01-30 15:31:28 +01:00
committed by Eike Ziller
parent 284f7dfb2f
commit 25a767c760
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/helpviewer_qwv.cpp
View File

@@ -138,8 +138,12 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
if (!engine.findFile(url).isValid()) {
if (url.startsWith(HelpViewer::NsNokia) || url.startsWith(HelpViewer::NsTrolltech)) {
QUrl newUrl = request.url();
if (!newUrl.path().startsWith(QLatin1String("/qdoc/"))) {
newUrl.setPath(QLatin1String("/qdoc/") + newUrl.path());
if (!newUrl.path().startsWith(QLatin1String("/qdoc/")) ||
!newUrl.path().startsWith(QLatin1String("/doc/"))) {
QString path = newUrl.path();
newUrl.setPath(QLatin1String("/qdoc/") + path);
if (!engine.findFile(newUrl).isValid())
newUrl.setPath(QLatin1String("/doc/") + path);
url = newUrl.toString();
}
}