diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-28 13:01:30 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-28 13:01:30 (GMT) |
| commit | 726ce1dcba37d85bc743559e1b882a72413d1d82 (patch) | |
| tree | 5e5f857966e6f6f98486328289aa42d76d05f837 /src | |
| parent | f3a36a7e59b24bc388ed15372f941bf649bc5ae4 (diff) | |
| parent | 0123cde833c2dd5ab9306baca52e3ad4b1ef4010 (diff) | |
| download | Qt-726ce1dcba37d85bc743559e1b882a72413d1d82.zip Qt-726ce1dcba37d85bc743559e1b882a72413d1d82.tar.gz Qt-726ce1dcba37d85bc743559e1b882a72413d1d82.tar.bz2 | |
Merge branch '4.6' of git@scm.dev-nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qpixmap_s60.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp index 123777c..dccc691 100644 --- a/src/gui/image/qpixmap_s60.cpp +++ b/src/gui/image/qpixmap_s60.cpp @@ -67,6 +67,7 @@ const uchar qt_pixmap_bit_mask[] = { 0x01, 0x02, 0x04, 0x08, /*! \class QSymbianFbsClient \since 4.6 + \internal Symbian Font And Bitmap server client that is used to lock the global bitmap heap. Only used in @@ -147,6 +148,7 @@ void QSymbianFbsHeapLock::relock() /*! \class QSymbianBitmapDataAccess \since 4.6 + \internal Data access class that is used to locks/unlocks pixel data when drawing or modifying CFbsBitmap pixel data. diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 1768fe6..a2f0179 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -736,7 +736,7 @@ QT_BEGIN_NAMESPACE /*! \fn void QTest::qWaitForWindowShown(QWidget *window) - Waits until the window is shown in the screen. This is mainly useful for + Waits until the \a window is shown in the screen. This is mainly useful for asynchronous systems like X11, where a window will be mapped to screen some time after being asked to show itself on the screen. |