diff options
| -rw-r--r-- | demos/sqlbrowser/browser.cpp | 2 | ||||
| -rw-r--r-- | doc/src/index.qdoc | 2 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/helpviewer.cpp | 4 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/helpviewer_qwv.cpp | 7 | ||||
| -rw-r--r-- | tools/qdoc3/test/qdeclarative.qdocconf | 16 |
5 files changed, 7 insertions, 24 deletions
diff --git a/demos/sqlbrowser/browser.cpp b/demos/sqlbrowser/browser.cpp index 1232428..fe699c7 100644 --- a/demos/sqlbrowser/browser.cpp +++ b/demos/sqlbrowser/browser.cpp @@ -242,6 +242,6 @@ void Browser::updateActions() void Browser::about() { QMessageBox::about(this, tr("About"), tr("The SQL Browser demonstration " - "show how a data browser can be used to visualize the results of SQL" + "shows how a data browser can be used to visualize the results of SQL" "statements on a live database")); } diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 2f23e6e..2e6f9bd 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -75,7 +75,7 @@ <li><a href="classes.html">All classes</a></li> <li><a href="namespaces.html">All namespaces</a></li> <li><a href="functions.html">All functions</a></li> - <li><a href="platform-specific.html">Platform support & speciffics</a></li> + <li><a href="platform-specific.html">Platform support & specifics</a></li> </ul> </div> <div class="sectionlist"> diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp index 22b3f30..25214e2 100644 --- a/tools/assistant/tools/assistant/helpviewer.cpp +++ b/tools/assistant/tools/assistant/helpviewer.cpp @@ -52,9 +52,7 @@ QT_BEGIN_NAMESPACE -QString AbstractHelpViewer::DocPath = QString::fromLatin1("qthelp://com." - "trolltech.qt.%1/").arg(QString(QLatin1String(QT_VERSION_STR)) - .replace(QLatin1String("."), QLatin1String(""))); +QString AbstractHelpViewer::DocPath = QString::fromLatin1("qthelp://com.trolltech."); QString AbstractHelpViewer::AboutBlank = QCoreApplication::translate("HelpViewer", "<title>about:blank</title>"); diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp index a19b29a..585c69d 100644 --- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp +++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp @@ -139,9 +139,10 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/, // the virtual folder if (!helpEngine.findFile(url).isValid()) { if (url.startsWith(AbstractHelpViewer::DocPath)) { - if (!url.startsWith(AbstractHelpViewer::DocPath + QLatin1String("qdoc/"))) { - url = url.replace(AbstractHelpViewer::DocPath, - AbstractHelpViewer::DocPath + QLatin1String("qdoc/")); + QUrl newUrl = request.url(); + if (!newUrl.path().startsWith(QLatin1String("/qdoc/"))) { + newUrl.setPath(QLatin1String("/qdoc/")+newUrl.path()); + url = newUrl.toString(); } } } diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf index 125a410..80050e3 100644 --- a/tools/qdoc3/test/qdeclarative.qdocconf +++ b/tools/qdoc3/test/qdeclarative.qdocconf @@ -100,19 +100,3 @@ imagedirs = $QT_SOURCE_TREE/doc/src/images \ outputdir = $QT_BUILD_TREE/doc-build/html-qml tagfile = $QT_BUILD_TREE/doc-build/html-qml/qt.tags base = file:$QT_BUILD_TREE/doc/html-qml - -HTML.stylesheets = classic.css - -HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n" \ - "<tr>\n" \ - "<td align=\"left\" valign=\"top\">" \ - "<img src=\"images/qt-logo.png\" align=\"left\" border=\"0\"/>" \ - "</td>\n" \ - "<td width=\"1\"> </td>" \ - "<td class=\"postheader\" valign=\"center\" align=\"left\">" \ - "<a href=\"qmlreference.html\">" \ - "<font color=\"#004faf\">Home</font></a> ·" \ - " <a href=\"qmlelements.html\">" \ - "<font color=\"#004faf\">Elements</font></a>" \ - "</td>\n" \ - "</tr></table>" |