diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:43:15 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:43:15 (GMT) |
| commit | 5038fe5d545292c58f0e06b1b6a34115ef8d357a (patch) | |
| tree | 87a5ed53c8be616d5437fa0877ec2ea98de5c614 /src/gui/painting | |
| parent | c53414e11b3f980f81a4470b3fb52f9d1aa80d56 (diff) | |
| parent | d834d94bde645d43dd981154bd0ba99d8e81f040 (diff) | |
| download | Qt-5038fe5d545292c58f0e06b1b6a34115ef8d357a.zip Qt-5038fe5d545292c58f0e06b1b6a34115ef8d357a.tar.gz Qt-5038fe5d545292c58f0e06b1b6a34115ef8d357a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qdrawutil.h | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 854d0aa..ea93764 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -217,7 +217,7 @@ struct QTexturedBrushData : public QBrushData // returns true if the brush has a pixmap (or bitmap) set as the // brush texture, false otherwise -bool qHasPixmapTexture(const QBrush& brush) +bool Q_GUI_EXPORT qHasPixmapTexture(const QBrush& brush) { if (brush.style() != Qt::TexturePattern) return false; diff --git a/src/gui/painting/qdrawutil.h b/src/gui/painting/qdrawutil.h index 38d9ec0..306f4e2 100644 --- a/src/gui/painting/qdrawutil.h +++ b/src/gui/painting/qdrawutil.h @@ -161,10 +161,18 @@ struct Q_GUI_EXPORT QTileRules Qt::TileRule vertical; }; -Q_GUI_EXPORT void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargins &targetMargins, const QPixmap &pixmap, - const QRect &sourceRect, const QMargins &sourceMargins, const QTileRules &rules = QTileRules()); - -Q_GUI_EXPORT inline void qDrawBorderPixmap(QPainter *painter, const QRect &target, const QMargins &margins, const QPixmap &pixmap) +Q_GUI_EXPORT void qDrawBorderPixmap(QPainter *painter, + const QRect &targetRect, + const QMargins &targetMargins, + const QPixmap &pixmap, + const QRect &sourceRect, + const QMargins &sourceMargins, + const QTileRules &rules = QTileRules()); + +Q_GUI_EXPORT inline void qDrawBorderPixmap(QPainter *painter, + const QRect &target, + const QMargins &margins, + const QPixmap &pixmap) { qDrawBorderPixmap(painter, target, margins, pixmap, pixmap.rect(), margins); } |