diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-06 14:13:01 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-06 14:13:01 (GMT) |
| commit | bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8 (patch) | |
| tree | 0feff5b756825243df3fa7e5d2dd564135f8bed8 /doc | |
| parent | 496341552bb178d1bd13474fd3259898fc7c9cfd (diff) | |
| parent | ac0a7503d58946b38d4d18bb077dd9530ccbb6f9 (diff) | |
| download | Qt-bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8.zip Qt-bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8.tar.gz Qt-bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/examples/activeqt/dotnet.qdoc | 2 | ||||
| -rwxr-xr-x | doc/src/template/scripts/functions.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/examples/activeqt/dotnet.qdoc b/doc/src/examples/activeqt/dotnet.qdoc index ec13ce8..d758056 100644 --- a/doc/src/examples/activeqt/dotnet.qdoc +++ b/doc/src/examples/activeqt/dotnet.qdoc @@ -314,7 +314,7 @@ \l{http://qt.nokia.com/products/qsa/}{QSA}, the cross platform scripting solution for Qt applications, and to COM clients in general. - When using the "IJW" method, in priciple the only limitation is the + When using the "IJW" method, in principle the only limitation is the time required to write the wrapper classes and data type conversion functions. diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js index 62bc535..3ab4a08 100755 --- a/doc/src/template/scripts/functions.js +++ b/doc/src/template/scripts/functions.js @@ -184,7 +184,7 @@ var blankRE=/^\s*$/; function CheckEmptyAndLoadList() { /* Start Extracting information for feedback and adding this to the feedback form */ - var pageUrl = window.location.href; + var pageUrl = window.location.pathname; var pageVal = $('title').html(); $('#pageType').removeClass('red'); $('#feedUrl').remove(); |