diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 19:45:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 19:45:42 (GMT) |
| commit | 8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb (patch) | |
| tree | a808f038dd5f1b254d2f41d637c085b8ccbbc747 /src/gui | |
| parent | d194ebdc199fdd85245bfecb766d836dfa79c3f3 (diff) | |
| parent | a4f3cd9d7e67a8335d941321d7b8d6406d9907d6 (diff) | |
| download | Qt-8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb.zip Qt-8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb.tar.gz Qt-8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set
Fix compilation on AIX 5.3 with gcc
Doc: Fixed typo
Fix poor English in QStyle::polish documentation.
Fix a few typos in comments and docs.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qcocoamenuloader_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/painting/qbackingstore.cpp | 2 | ||||
| -rw-r--r-- | src/gui/styles/qstyle.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm index 8d38f45..4bf6ed9 100644 --- a/src/gui/kernel/qcocoamenuloader_mac.mm +++ b/src/gui/kernel/qcocoamenuloader_mac.mm @@ -89,7 +89,7 @@ QT_USE_NAMESPACE - (void)ensureAppMenuInMenu:(NSMenu *)menu { // The application menu is the menu in the menu bar that contains the - // 'Quit' item. When changing menu bar (e.g when swithing between + // 'Quit' item. When changing menu bar (e.g when switching between // windows with different menu bars), we never recreate this menu, but // instead pull it out the current menu bar and place into the new one: NSMenu *mainMenu = [NSApp mainMenu]; diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index ac9b994..8a1c154 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -446,7 +446,7 @@ QRegion QWidgetBackingStore::dirtyRegion(QWidget *widget) const /*! Returns the static content inside the \a parent if non-zero; otherwise the static content - for the entire backing store is returned. The content will be clipped to \a withingClipRect + for the entire backing store is returned. The content will be clipped to \a withinClipRect if non-empty. */ QRegion QWidgetBackingStore::staticContents(QWidget *parent, const QRect &withinClipRect) const diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index 0a75492..3ebfab2 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -367,10 +367,10 @@ QStyle::~QStyle() Note that the default implementation does nothing. Reasonable actions in this function might be to call the QWidget::setBackgroundMode() function for the widget. Do not use - the function to set, for example, the geometry; reimplementing - this function do provide a back-door through which the appearance - of a widget can be changed, but with Qt 4.0's style engine there - is rarely necessary to implement this function; reimplement the + the function to set, for example, the geometry. Reimplementing + this function provides a back-door through which the appearance + of a widget can be changed, but with Qt's style engine it is + rarely necessary to implement this function; reimplement drawItemPixmap(), drawItemText(), drawPrimitive(), etc. instead. The QWidget::inherits() function may provide enough information to |