diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-27 23:04:41 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-27 23:04:41 +0200 |
| commit | fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6 (patch) | |
| tree | 2cdd417bc0be39b12674f33052462d19d9e38ef9 /src/gui/painting/qcolor.cpp | |
| parent | 7b1f8c542bc9f41408f0a54b853d75d0c09a2775 (diff) | |
| parent | d0bc0a26f8ac4c2f02819c262b8aa7c3dd1cad3b (diff) | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
Diffstat (limited to 'src/gui/painting/qcolor.cpp')
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 6b58f14883..b1fe3aa072 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -2241,4 +2241,12 @@ QDataStream &operator>>(QDataStream &stream, QColor &color) \sa QColor::rgb(), QColor::rgba() */ +/*! \fn void QColormap::initialize() + \internal +*/ + +/*! \fn void QColormap::cleanup() + \internal +*/ + QT_END_NAMESPACE |