summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qvariant.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-28 11:07:32 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-28 11:10:29 +0100
commit02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch)
tree156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/corelib/kernel/qvariant.cpp
parentbf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff)
parent0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
-rw-r--r--src/corelib/kernel/qvariant.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 882bfd9468..8cc26c5ff6 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -949,8 +949,8 @@ Q_CORE_EXPORT void QVariantPrivate::registerHandler(const int /* Modules::Names
\section1 A Note on GUI Types
- Because QVariant is part of the QtCore library, it cannot provide
- conversion functions to data types defined in QtGui, such as
+ Because QVariant is part of the Qt Core module, it cannot provide
+ conversion functions to data types defined in Qt GUI, such as
QColor, QImage, and QPixmap. In other words, there is no \c
toColor() function. Instead, you can use the QVariant::value() or
the qvariant_cast() template function. For example: