summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-06-17 09:09:14 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-06-17 09:09:14 (GMT)
commit7ff200e33e49406e4750f306d2f3c317af1ba947 (patch)
tree8934c201299d7d53e3da9dc321e7c24beccc0939
parentb38a1c034df8c807331bf57a0dbcbe05991130f8 (diff)
downloadQt-7ff200e33e49406e4750f306d2f3c317af1ba947.zip
Qt-7ff200e33e49406e4750f306d2f3c317af1ba947.tar.gz
Qt-7ff200e33e49406e4750f306d2f3c317af1ba947.tar.bz2
Fixed MinGW compilation.
Reviewed-by: Simon Hausmann <shausman@trolltech.com>
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp
index ff0463b..adc55ae 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp
@@ -654,7 +654,7 @@ QVariant QWebElement::evaluateScript(const QString& scriptSource)
return QVariant();
JSC::ScopeChain& scopeChain = state->dynamicGlobalObject()->globalScopeChain();
- JSC::UString script((const ushort*)scriptSource.data(), scriptSource.length());
+ JSC::UString script((const UChar*)scriptSource.data(), scriptSource.length());
JSC::Completion completion = JSC::evaluate(state, scopeChain, JSC::makeSource(script), thisValue);
if ((completion.complType() != JSC::ReturnValue) && (completion.complType() != JSC::Normal))
return QVariant();