diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-03 09:22:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-03 09:22:58 (GMT) |
| commit | 06c23ac8a6d03af3b9674c8c7850560a0973b2fb (patch) | |
| tree | 69df44d6761ffc584327a0a3c00ad29c3cb058bf /src/3rdparty/webkit | |
| parent | 1f459f4040845919ffd46cea35958486f41abb3c (diff) | |
| parent | 3c6f31d6b7ec382e18cfaabf5b9d6e7e56304029 (diff) | |
| download | Qt-06c23ac8a6d03af3b9674c8c7850560a0973b2fb.zip Qt-06c23ac8a6d03af3b9674c8c7850560a0973b2fb.tar.gz Qt-06c23ac8a6d03af3b9674c8c7850560a0973b2fb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Added text about -random and -seed options in QTest to changelog
Add another part of the source code to the snippet.
Update changes-4.8.0
Update translation sources.
Update the changelog for qdoc in 4.8
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp index 5e0a2e6..fc9bd04 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp @@ -918,7 +918,7 @@ void FrameLoaderClientQt::committedLoad(WebCore::DocumentLoader* loader, const c WebCore::ResourceError FrameLoaderClientQt::cancelledError(const WebCore::ResourceRequest& request) { ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().prettyURL(), - QCoreApplication::translate("QWebFrame", "Request cancelled", 0, QCoreApplication::UnicodeUTF8)); + QCoreApplication::translate("QWebFrame", "Request canceled", 0, QCoreApplication::UnicodeUTF8)); error.setIsCancellation(true); return error; } |