summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-24 13:39:05 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-24 13:39:05 (GMT)
commitec646b00cb485e2fa0d47ec4d5ffaf9a0fcf9ca6 (patch)
tree8a2f761b8ea72ed716377dc51fd06a4b17293ee7 /src/gui
parent1ba6875372bbe13b7df90a6cd1d547c628b47cd0 (diff)
parentab79d6de524ff8a92ad9c3f79a139be7459ef7ed (diff)
downloadQt-ec646b00cb485e2fa0d47ec4d5ffaf9a0fcf9ca6.zip
Qt-ec646b00cb485e2fa0d47ec4d5ffaf9a0fcf9ca6.tar.gz
Qt-ec646b00cb485e2fa0d47ec4d5ffaf9a0fcf9ca6.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qpainter.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 4d52c5d..bcb0b50 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -111,8 +111,9 @@ public:
qreal scaleY;
qreal rotation;
qreal opacity;
- static Fragment create(const QPointF &pos, const QRectF &sourceRect, qreal scaleX = 1,
- qreal scaleY = 1, qreal rotation = 0, qreal opacity = 1);
+ static Fragment Q_GUI_EXPORT create(const QPointF &pos, const QRectF &sourceRect,
+ qreal scaleX = 1, qreal scaleY = 1,
+ qreal rotation = 0, qreal opacity = 1);
};
enum FragmentHint {