Unreviewed prospective Qt/MSVC build fix.
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Sep 2012 16:24:37 +0000 (16:24 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Sep 2012 16:24:37 +0000 (16:24 +0000)
* platform/qt/UserAgentQt.cpp:
(WebCore::UserAgentQt::standardUserAgent): Try to make the conversion from the 8-bit
String to a QLatin1String successful.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@128474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/qt/UserAgentQt.cpp

index 1696c33..acd63d2 100644 (file)
@@ -1,3 +1,11 @@
+2012-09-13  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Unreviewed prospective Qt/MSVC build fix.
+
+        * platform/qt/UserAgentQt.cpp:
+        (WebCore::UserAgentQt::standardUserAgent): Try to make the conversion from the 8-bit
+        String to a QLatin1String successful.
+
 2012-09-13  Lauro Neto  <lauro.neto@openbossa.org>
 
         [Qt][WK2] fast/forms/access-key-for-all-elements.html fails
index 1ce0640..09db702 100644 (file)
@@ -86,7 +86,7 @@ String UserAgentQt::standardUserAgent(const String &applicationNameForUserAgent,
 #ifdef Q_OS_AIX
             "AIX"
 #elif defined Q_OS_WIN32
-            windowsVersionForUAString()
+            windowsVersionForUAString().latin1().data()
 #elif defined Q_OS_DARWIN
 #ifdef __i386__ || __x86_64__
             "Intel Mac OS X"