diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-14 17:45:44 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-14 17:45:44 +1000 |
| commit | 1b30b3a6726adf806ae221357393e562285e8346 (patch) | |
| tree | c650ff836d3abdf5890726354ee6e2b9bce11304 /doc/src/snippets/code/doc_src_qtscript.cpp | |
| parent | 1c1a5fe0e2d9e28be5e0e14732d79d34c9bb2a74 (diff) | |
| parent | 704dd92581783d91ccd234d58896d7078eed14a5 (diff) | |
| download | qt4-tools-1b30b3a6726adf806ae221357393e562285e8346.tar.gz | |
Merge remote branch 'origin/4.8' into 4.8-from-4.7
Conflicts:
src/gui/text/qtextengine_p.h
src/network/ssl/qsslsocket_openssl.cpp
Diffstat (limited to 'doc/src/snippets/code/doc_src_qtscript.cpp')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qtscript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/doc_src_qtscript.cpp b/doc/src/snippets/code/doc_src_qtscript.cpp index 822e6fa0f7..de82029513 100644 --- a/doc/src/snippets/code/doc_src_qtscript.cpp +++ b/doc/src/snippets/code/doc_src_qtscript.cpp @@ -544,7 +544,7 @@ QScriptValue constructXmlStreamReader(QScriptContext *context, QScriptEngine *en XmlStreamReaderPointer pointer(reader); // store the shared pointer in the script object that we are constructing - return engine->newVariant(context->thisObject(), qVariantFromValue(pointer)); + return engine->newVariant(context->thisObject(), QVariant::fromValue(pointer)); } //! [93] |