Changeset 82082 in webkit

Timestamp:

Mar 27, 2011 3:54:59 PM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

2011-03-27 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Andreas Kling.

[Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
​https://bugs.webkit.org/show_bug.cgi?id=57087

Use explicit conversion for string to avoid depending on the default codec
installed by the user code.

• WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp: (WTR::activateFonts):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-27  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
+        https://bugs.webkit.org/show_bug.cgi?id=57087
+
+        Use explicit conversion for string to avoid depending on the default codec
+        installed by the user code.
+
+        * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
+        (WTR::activateFonts):
+
 2011-03-26  Maciej Stachowiak  <mjs@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp

@@ -58 +58 @@
         return;
 
-    QByteArray fontDir = getenv("WEBKIT_TESTFONTS");
-    if (fontDir.isEmpty() || !QDir(fontDir).exists()) {
+    char* const fontDir = getenv("WEBKIT_TESTFONTS");
+    const QString fontDirString = QString::fromLocal8Bit(fontDir);
+    if (!fontDirString.isEmpty() || !QDir(fontDirString).exists()) {
         fprintf(stderr,
                 "\n\n"
@@ -78 +79 @@
     if (!FcConfigParseAndLoad (config, (FcChar8*) configFile.data(), true))
         qFatal("Couldn't load font configuration file");
-    if (!FcConfigAppFontAddDir (config, (FcChar8*) fontDir.data()))
+    if (!FcConfigAppFontAddDir (config, (FcChar8*) fontDir))
         qFatal("Couldn't add font dir!");
     FcConfigSetCurrent(config);
@@ -86 +87 @@
 #endif
 
-    QApplication::setGraphicsSystem("raster");
+    QApplication::setGraphicsSystem(QLatin1String("raster"));
     QApplication::setStyle(new QWindowsStyle);
 
-    QFont f("Sans Serif");
+    QFont f(QLatin1String("Sans Serif"));
     f.setPointSize(9);
     f.setWeight(QFont::Normal);