diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-15 12:19:43 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-15 12:19:43 (GMT) |
| commit | afb6c4935dc6a7be0f9de092003477692559815c (patch) | |
| tree | bb4311a2bf2a0aa437735147cd465e4a0f9d56f6 /src/gui/painting | |
| parent | cd5f0f868bc830c6b350e8263fd53597f52e1146 (diff) | |
| download | Qt-afb6c4935dc6a7be0f9de092003477692559815c.zip Qt-afb6c4935dc6a7be0f9de092003477692559815c.tar.gz Qt-afb6c4935dc6a7be0f9de092003477692559815c.tar.bz2 | |
Fix ambiguous overload for QTileRules constructor
Also fix the relations in the documentation
Reviewed-by: David Boddie
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qdrawutil.cpp | 6 | ||||
| -rw-r--r-- | src/gui/painting/qdrawutil.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp index 17cf196..7be8e04 100644 --- a/src/gui/painting/qdrawutil.cpp +++ b/src/gui/painting/qdrawutil.cpp @@ -1044,7 +1044,7 @@ void qDrawItem(QPainter *p, Qt::GUIStyle gs, Holds the rules used to draw a pixmap or image split into nine segments, similar to \l{http://www.w3.org/TR/css3-background/}{CSS3 border-images}. - \sa Qt::TileRule, QMargins + \sa Qt::TileRule, QMargins, qDrawBorderPixmap */ /*! \fn QTileRules::QTileRules(Qt::TileRule horizontalRule, Qt::TileRule verticalRule) @@ -1060,7 +1060,7 @@ void qDrawItem(QPainter *p, Qt::GUIStyle gs, /*! \fn void qDrawBorderPixmap(QPainter *painter, const QRect &target, const QMargins &margins, const QPixmap &pixmap) \since 4.6 - \relates QMargins + \relates QPainter Draws the given \a pixmap into the given \a target rectangle, using the given \a painter. The pixmap will be split into nine segments and drawn @@ -1156,6 +1156,8 @@ static inline void qDrawHorizontallyRoundedPixmap(QPainter *painter, const QRect /*! \since 4.6 + \relates QPainter + Draws the indicated \a sourceRect rectangle from the given \a pixmap into the given \a targetRect rectangle, using the given \a painter. The pixmap will be split into nine segments according to the given \a targetMargins diff --git a/src/gui/painting/qdrawutil.h b/src/gui/painting/qdrawutil.h index ce89e22..3a2dd0e 100644 --- a/src/gui/painting/qdrawutil.h +++ b/src/gui/painting/qdrawutil.h @@ -135,7 +135,7 @@ Q_GUI_EXPORT QT3_SUPPORT void qDrawArrow(QPainter *p, Qt::ArrowType type, Qt::GU struct QTileRules { - inline QTileRules(Qt::TileRule horizontalRule, Qt::TileRule verticalRule = Qt::Stretch) + inline QTileRules(Qt::TileRule horizontalRule, Qt::TileRule verticalRule) : horizontal(horizontalRule), vertical(verticalRule) {} inline QTileRules(Qt::TileRule rule = Qt::Stretch) : horizontal(rule), vertical(rule) {} |