diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:02:21 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:02:21 (GMT) |
| commit | e658bcb0e64acca9684f0897510d639af98ab552 (patch) | |
| tree | 5f2f155093238f0b6e808bc0d6cb54b3bf0b6c4f /src/gui/painting/qdrawutil.h | |
| parent | bb35c5aaa2ad80eaa7f88df6d83945adbf9bde92 (diff) | |
| parent | 1ffaf40f5cffca57d7e116d61935ccd034239222 (diff) | |
| download | Qt-e658bcb0e64acca9684f0897510d639af98ab552.zip Qt-e658bcb0e64acca9684f0897510d639af98ab552.tar.gz Qt-e658bcb0e64acca9684f0897510d639af98ab552.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Diffstat (limited to 'src/gui/painting/qdrawutil.h')
| -rw-r--r-- | src/gui/painting/qdrawutil.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/painting/qdrawutil.h b/src/gui/painting/qdrawutil.h index 3a2dd0e..22a57e9 100644 --- a/src/gui/painting/qdrawutil.h +++ b/src/gui/painting/qdrawutil.h @@ -137,22 +137,22 @@ struct QTileRules { inline QTileRules(Qt::TileRule horizontalRule, Qt::TileRule verticalRule) : horizontal(horizontalRule), vertical(verticalRule) {} - inline QTileRules(Qt::TileRule rule = Qt::Stretch) + inline QTileRules(Qt::TileRule rule = Qt::StretchTile) : horizontal(rule), vertical(rule) {} Qt::TileRule horizontal; Qt::TileRule vertical; }; -Q_GUI_EXPORT void qDrawBorderPixmap(QPainter *painter, - const QRect &targetRect, - const QMargins &targetMargins, +Q_GUI_EXPORT void qDrawBorderPixmap(QPainter *painter, + const QRect &targetRect, + const QMargins &targetMargins, const QPixmap &pixmap, - const QRect &sourceRect, - const QMargins &sourceMargins, + const QRect &sourceRect, + const QMargins &sourceMargins, const QTileRules &rules = QTileRules()); -inline void qDrawBorderPixmap(QPainter *painter, - const QRect &target, - const QMargins &margins, +inline void qDrawBorderPixmap(QPainter *painter, + const QRect &target, + const QMargins &margins, const QPixmap &pixmap) { qDrawBorderPixmap(painter, target, margins, pixmap, pixmap.rect(), margins); |