diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/corelib/kernel/qvariant.cpp | |
parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
-rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 |
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: |