diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-10-16 12:49:20 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-10-16 12:49:20 (GMT) |
| commit | 701c8a61f81cd691a071fce90f9c4c138edbfcf9 (patch) | |
| tree | ae8c7d3eb06284e55f5ab57f1c5634fae14022fa /src/gui | |
| parent | 25f4ccc3a9de2e4610974540f88c331238218c72 (diff) | |
| parent | 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b (diff) | |
| download | Qt-701c8a61f81cd691a071fce90f9c4c138edbfcf9.zip Qt-701c8a61f81cd691a071fce90f9c4c138edbfcf9.tar.gz Qt-701c8a61f81cd691a071fce90f9c4c138edbfcf9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 0773559..a624b10 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -5297,7 +5297,7 @@ void QGraphicsScene::setActivePanel(QGraphicsItem *item) /*! \since 4.4 - Returns the current active window, or 0 if there is no window is currently + Returns the current active window, or 0 if no window is currently active. \sa QGraphicsScene::setActiveWindow() |