summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-08-26 07:54:33 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-08-26 07:54:33 (GMT)
commit87136163dcd7ffb8759875bca2b4e559a32167cd (patch)
tree5c5467759ffdf69d5e62a052fb77fc64d5a54f45 /src/corelib/tools
parent0c70be512bfc40e8a2a09f60a66b7ecb114e748e (diff)
parent8f389d20bc01a355a6a1885b5bd1d30bd2ff0c71 (diff)
downloadQt-87136163dcd7ffb8759875bca2b4e559a32167cd.zip
Qt-87136163dcd7ffb8759875bca2b4e559a32167cd.tar.gz
Qt-87136163dcd7ffb8759875bca2b4e559a32167cd.tar.bz2
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qlocale.qdoc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index 5d4f305..95a7165 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -806,6 +806,10 @@
\internal
*/
/*!
+ \fn QSystemLocale::CurrencyToStringArgument::CurrencyToStringArgument(const QVariant &v, const QString &s)
+ \internal
+*/
+/*!
\variable QSystemLocale::CurrencyToStringArgument::value
An input value that should be converted to its string representation.