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 | |
| 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')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.h | 4 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index b06b93a..41067f1 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -137,7 +137,7 @@ void QWebViewPrivate::_q_pageDestroyed() It can be used in various applications to display web content live from the Internet. - The image below shows QWebView previewed in \QD with the Trolltech website. + The image below shows QWebView previewed in \QD with a Nokia website. \image qwebview-url.png diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index ad4bc55..f28f94e 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -44,10 +44,6 @@ #include <QtCore/qglobal.h> -#ifdef Q_OS_SYMBIAN -# include <e32def.h> -#endif - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE 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() |