diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 10:36:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 10:36:16 (GMT) |
| commit | 9b77de3effdb2eb7d6df212ab9a8a19551ecb550 (patch) | |
| tree | b805d65324498a377e3732c5ca3615df0f1c7750 /src | |
| parent | 32ecf8e8ad326ea13ec9a430c99ce540e8b4efac (diff) | |
| parent | cfa3b8f2a7a3b3122fdff7781e32066e0d7f8d66 (diff) | |
| download | Qt-9b77de3effdb2eb7d6df212ab9a8a19551ecb550.zip Qt-9b77de3effdb2eb7d6df212ab9a8a19551ecb550.tar.gz Qt-9b77de3effdb2eb7d6df212ab9a8a19551ecb550.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:
Fix a small typo: therfore -> therefore
Fix a small typo in setColor description (brush -> color)
only add phonon and scripttools dependencies if they're available, otherwise linking will fail
s/INCPATH/INCLUDEPATH/
qdoc: Added breadcrumbs for most other pages.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qpalette.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/type/qschematype_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 6e8c90e..98e8f66 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -795,7 +795,7 @@ const QBrush &QPalette::brush(ColorGroup gr, ColorRole cr) const /*! \fn void QPalette::setColor(ColorGroup group, ColorRole role, const QColor &color) - Sets the brush in the specified color \a group, used for the given + Sets the color in the specified color \a group, used for the given color \a role, to the specified solid \a color. \sa setBrush() color() ColorRole diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h index 1b26fb8..ff8b86b 100644 --- a/src/xmlpatterns/type/qschematype_p.h +++ b/src/xmlpatterns/type/qschematype_p.h @@ -174,7 +174,7 @@ namespace QPatternist * a QXmlName instance stored as a member. * * If the type code was refactored to not be store globally and - * therfore by design would be tied to a name pool, this argument could + * therefore by design would be tied to a name pool, this argument could * be removed. */ virtual QXmlName name(const NamePool::Ptr &np) const = 0; |