Commit 332e3c3b authored by barraclough@apple.com's avatar barraclough@apple.com

Qt build fix.

* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::convertQVariantToValue):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@80669 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b565c268
2011-03-09 Gavin Barraclough <barraclough@apple.com>
Qt build fix.
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::convertQVariantToValue):
2011-03-09 Andy Estes <aestes@apple.com>
Reviewed by Adam Barth.
......
......@@ -845,17 +845,13 @@ JSValue convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, con
QRegExp re = variant.value<QRegExp>();
if (re.isValid()) {
UString uflags;
if (re.caseSensitivity() == Qt::CaseInsensitive)
uflags = "i"; // ### Can't do g or m
UString pattern((UChar*)re.pattern().utf16(), re.pattern().length());
RegExpFlags flags = (re.caseSensitivity() == Qt::CaseInsensitive) ? FlagIgnoreCase : NoFlags;
RefPtr<JSC::RegExp> regExp = JSC::RegExp::create(&exec->globalData(), pattern, uflags);
RefPtr<JSC::RegExp> regExp = JSC::RegExp::create(&exec->globalData(), pattern, flags);
if (regExp->isValid())
return new (exec) RegExpObject(exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->regExpStructure(), regExp.release());
else
return jsNull();
return jsNull();
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment