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/src_xmlpatterns_api_qxmlquery.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/src_xmlpatterns_api_qxmlquery.cpp')
| -rw-r--r-- | doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp index d446af7858..dd5cd5ba37 100644 --- a/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp +++ b/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp @@ -163,7 +163,7 @@ break; default: if (v.userType() == qMetaTypeId<QXmlName>()) { - QXmlName n = qVariantValue<QXmlName>(v); + QXmlName n = qvariant_cast<QXmlName>(v); // process QXmlName n... } else { |