diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 11:49:35 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 11:54:30 (GMT) |
| commit | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (patch) | |
| tree | 72031d16ebed89a60590ce2392803888f99369f7 /src/gui/text/qfontengine.cpp | |
| parent | 06dc8791a70329dc8e985a0eed7e434d1f762ec5 (diff) | |
| parent | 8f9d38ed63a2c568596febe5ea59a55fe03d7ba9 (diff) | |
| download | Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.zip Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.tar.gz Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Conflicts:
src/gui/text/text.pri
src/plugins/generic/linuxinput/qlinuxinput.cpp
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 9763792..b37a190 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -495,7 +495,7 @@ static void collectSingleContour(qreal x0, qreal y0, uint *grid, int x, int y, i path->closeSubpath(); } -void qt_addBitmapToPath(qreal x0, qreal y0, const uchar *image_data, int bpl, int w, int h, QPainterPath *path) +Q_GUI_EXPORT void qt_addBitmapToPath(qreal x0, qreal y0, const uchar *image_data, int bpl, int w, int h, QPainterPath *path) { uint *grid = new uint[(w+1)*(h+1)]; // set up edges |