Changeset 81968 in webkit
- Timestamp:
- Mar 25, 2011 10:25:34 AM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r81966 r81968 1 2011-03-25 Benjamin Poulain <benjamin.poulain@nokia.com> 2 3 Reviewed by Andreas Kling. 4 5 [Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled 6 https://bugs.webkit.org/show_bug.cgi?id=57087 7 8 Use explicit conversion for string to avoid depending on the default codec 9 installed by the user code. 10 11 * Platform/qt/SharedMemoryQt.cpp: 12 (WebKit::SharedMemory::create): 13 * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp: 14 (WebKit::initializeGTK): 15 * UIProcess/API/qt/tests/qgraphicswkview/tst_qgraphicswkview.cpp: 16 (tst_QGraphicsWKView::loadEmptyPage): 17 (tst_QGraphicsWKView::loadEmptyUrl): 18 * UIProcess/API/qt/tests/qwkpage/tst_qwkpage.cpp: 19 (tst_QWKPage::loadEmptyUrl): 20 * UIProcess/Launcher/qt/ProcessLauncherQt.cpp: 21 (WebKit::ProcessLauncher::launchProcess): 22 * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: 23 (WebKit::getPluginDisplay): 24 * WebProcess/qt/WebProcessMainQt.cpp: 25 (WebKit::EnvHttpProxyFactory::initializeFromEnvironment): 26 (WebKit::WebProcessMainQt): 27 1 28 2011-03-25 Brent Fulgham <bfulgham@webkit.org> 2 29 -
trunk/Source/WebKit2/Platform/qt/SharedMemoryQt.cpp
r77765 r81968 102 102 PassRefPtr<SharedMemory> SharedMemory::create(size_t size) 103 103 { 104 QString tempName = QDir::temp().filePath( "qwkshm.XXXXXX");104 QString tempName = QDir::temp().filePath(QLatin1String("qwkshm.XXXXXX")); 105 105 QByteArray tempNameCSTR = tempName.toLocal8Bit(); 106 106 char* tempNameC = tempNameCSTR.data(); -
trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
r80007 r81968 41 41 static void initializeGTK() 42 42 { 43 QLibrary library( "libgtk-x11-2.0.so.0");43 QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); 44 44 if (library.load()) { 45 45 typedef void *(*gtk_init_check_ptr)(int*, char***); -
trunk/Source/WebKit2/UIProcess/API/qt/tests/qgraphicswkview/tst_qgraphicswkview.cpp
r81237 r81968 85 85 m_view->show(); 86 86 87 m_view->m_webView-> load(QUrl::fromLocalFile( TESTS_SOURCE_DIR "/html/basic_page.html"));87 m_view->m_webView-> load(QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html"))); 88 88 QVERIFY(waitForSignal(m_view->m_webView, SIGNAL(loadFinished(bool)))); 89 89 } … … 96 96 QVERIFY(!waitForSignal(m_view->m_webView->page(), SIGNAL(engineConnectionChanged(bool)), 50)); 97 97 98 m_view->m_webView->load(QUrl( ""));98 m_view->m_webView->load(QUrl(QLatin1String(""))); 99 99 QVERIFY(!waitForSignal(m_view->m_webView->page(), SIGNAL(engineConnectionChanged(bool)), 50)); 100 100 } -
trunk/Source/WebKit2/UIProcess/API/qt/tests/qwkpage/tst_qwkpage.cpp
r81237 r81968 52 52 { 53 53 m_page->load(QUrl()); 54 m_page->load(QUrl( ""));54 m_page->load(QUrl(QLatin1String(""))); 55 55 } 56 56 -
trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
r81507 r81968 86 86 void ProcessLauncher::launchProcess() 87 87 { 88 QString applicationPath = "%1 %2";88 QString applicationPath = QLatin1String("%1 %2"); 89 89 90 if (QFile::exists(QCoreApplication::applicationDirPath() + "/QtWebProcess")) {91 applicationPath = applicationPath.arg(QCoreApplication::applicationDirPath() + "/QtWebProcess");90 if (QFile::exists(QCoreApplication::applicationDirPath() + QLatin1String("/QtWebProcess"))) { 91 applicationPath = applicationPath.arg(QCoreApplication::applicationDirPath() + QLatin1String("/QtWebProcess")); 92 92 } else { 93 applicationPath = applicationPath.arg( "QtWebProcess");93 applicationPath = applicationPath.arg(QLatin1String("QtWebProcess")); 94 94 } 95 95 -
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
r81811 r81968 52 52 // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); 53 53 54 QLibrary library( "libgdk-x11-2.0", 0);54 QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); 55 55 if (!library.load()) 56 56 return 0; -
trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
r81186 r81968 83 83 bool wasSetByEnvironment = false; 84 84 85 QUrl proxyUrl = QUrl::fromUserInput( qgetenv("http_proxy"));85 QUrl proxyUrl = QUrl::fromUserInput(QString::fromLocal8Bit(qgetenv("http_proxy"))); 86 86 if (proxyUrl.isValid() && !proxyUrl.host().isEmpty()) { 87 87 int proxyPort = (proxyUrl.port() > 0) ? proxyUrl.port() : 8080; … … 91 91 m_httpProxy << QNetworkProxy::NoProxy; 92 92 93 proxyUrl = QUrl::fromUserInput( qgetenv("https_proxy"));93 proxyUrl = QUrl::fromUserInput(QString::fromLocal8Bit(qgetenv("https_proxy"))); 94 94 if (proxyUrl.isValid() && !proxyUrl.host().isEmpty()) { 95 95 int proxyPort = (proxyUrl.port() > 0) ? proxyUrl.port() : 8080; … … 133 133 Q_DECL_EXPORT int WebProcessMainQt(int argc, char** argv) 134 134 { 135 QApplication::setGraphicsSystem( "raster");135 QApplication::setGraphicsSystem(QLatin1String("raster")); 136 136 QApplication* app = new QApplication(argc, argv); 137 137 #ifndef NDEBUG
Note: See TracChangeset
for help on using the changeset viewer.