Changeset 128051 in webkit
- Timestamp:
- Sep 10, 2012 6:08:13 AM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r128049 r128051 1 2012-09-10 Kevin Funk <kevin.funk@kdab.com> 2 3 [Qt] Fix deprecation failures if QT_NO_DEPRECATED enabled 4 https://bugs.webkit.org/show_bug.cgi?id=96258 5 6 Reviewed by Simon Hausmann. 7 8 Sync with latest changes in Qt5. 9 10 * platform/qt/RenderThemeQt.cpp: 11 * platform/qt/SharedTimerQt.cpp: 12 1 13 2012-09-10 Christophe Dumez <christophe.dumez@intel.com> 2 14 -
trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp
r127802 r128051 868 868 string = QCoreApplication::translate("QWebPage", "%n file(s)", 869 869 "number of chosen file", 870 QCoreApplication::DefaultCodec,n);870 n); 871 871 } 872 872 -
trunk/Source/WebCore/platform/qt/SharedTimerQt.cpp
r125603 r128051 34 34 #include <QCoreApplication> 35 35 #include <QDebug> 36 #include <Q WeakPointer>36 #include <QPointer> 37 37 #include <wtf/CurrentTime.h> 38 38 … … 84 84 SharedTimerQt* SharedTimerQt::inst() 85 85 { 86 static Q WeakPointer<SharedTimerQt> timer;86 static QPointer<SharedTimerQt> timer; 87 87 if (!timer) { 88 88 timer = new SharedTimerQt(); -
trunk/Source/WebKit2/ChangeLog
r128050 r128051 1 2012-09-10 Kevin Funk <kevin.funk@kdab.com> 2 3 [Qt] Fix deprecation failures if QT_NO_DEPRECATED enabled 4 https://bugs.webkit.org/show_bug.cgi?id=96258 5 6 Reviewed by Simon Hausmann. 7 8 Sync with latest changes in Qt5. 9 10 * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp: 11 * WebProcess/qt/WebProcessQt.cpp: 12 1 13 2012-09-10 Carlos Garcia Campos <cgarcia@igalia.com> 2 14 -
trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp
r117777 r128051 40 40 41 41 #if PLATFORM(QT) 42 #include <QPointer> 42 43 #include <QSocketNotifier> 43 #include <QWeakPointer>44 44 #elif PLATFORM(GTK) 45 45 #include <glib.h> … … 176 176 177 177 private: 178 Q WeakPointer<QSocketNotifier> const m_socketNotifier;178 QPointer<QSocketNotifier> const m_socketNotifier; 179 179 }; 180 180 #endif -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
r97399 r128051 44 44 { 45 45 ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().string(), 46 QCoreApplication::translate("QWebFrame", "Request cancelled" , 0, QCoreApplication::UnicodeUTF8));46 QCoreApplication::translate("QWebFrame", "Request cancelled")); 47 47 error.setIsCancellation(true); 48 48 return error; … … 52 52 { 53 53 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url().string(), 54 QCoreApplication::translate("QWebFrame", "Request blocked" , 0, QCoreApplication::UnicodeUTF8));54 QCoreApplication::translate("QWebFrame", "Request blocked")); 55 55 } 56 56 … … 58 58 { 59 59 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url().string(), 60 QCoreApplication::translate("QWebFrame", "Cannot show URL" , 0, QCoreApplication::UnicodeUTF8));60 QCoreApplication::translate("QWebFrame", "Cannot show URL")); 61 61 } 62 62 … … 64 64 { 65 65 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url().string(), 66 QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change" , 0, QCoreApplication::UnicodeUTF8));66 QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change")); 67 67 } 68 68 … … 70 70 { 71 71 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url().string(), 72 QCoreApplication::translate("QWebFrame", "Cannot show mimetype" , 0, QCoreApplication::UnicodeUTF8));72 QCoreApplication::translate("QWebFrame", "Cannot show mimetype")); 73 73 } 74 74 … … 76 76 { 77 77 return ResourceError("QtNetwork", QNetworkReply::ContentNotFoundError, response.url().string(), 78 QCoreApplication::translate("QWebFrame", "File does not exist" , 0, QCoreApplication::UnicodeUTF8));78 QCoreApplication::translate("QWebFrame", "File does not exist")); 79 79 } 80 80 … … 82 82 { 83 83 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url().string(), 84 QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine" , 0, QCoreApplication::UnicodeUTF8));84 QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine")); 85 85 } 86 86 -
trunk/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp
r106355 r128051 74 74 75 75 qint64 bytesRead = maxlen < m_bytesAvailable ? maxlen : m_bytesAvailable; 76 if ( qMemCopy(data, static_cast<char*>(m_sharedMemory->data()) + m_sharedMemorySize - m_bytesAvailable, bytesRead)) {76 if (memcpy(data, static_cast<char*>(m_sharedMemory->data()) + m_sharedMemorySize - m_bytesAvailable, bytesRead)) { 77 77 m_bytesAvailable -= bytesRead; 78 78 return bytesRead; -
trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp
r126296 r128051 99 99 // that tends to overestimate the memory quite a bit (1 byte misalignment ~ 48 MiB misestimation). 100 100 // We use 1024 * 1023 for now to keep the estimation error down to +/- ~1 MiB. 101 uint64_t freeVolumeSpace = WebCore::getVolumeFreeSizeForPath(diskCache->cacheDirectory().to Ascii().constData()) / 1024 / 1023;101 uint64_t freeVolumeSpace = WebCore::getVolumeFreeSizeForPath(diskCache->cacheDirectory().toLocal8Bit().constData()) / 1024 / 1023; 102 102 103 103 // The following variables are initialised to 0 because WebProcess::calculateCacheSizes might not
Note: See TracChangeset
for help on using the changeset viewer.