diff options
| author | Frans Englich <frans.englich@nokia.com> | 2010-04-17 19:08:45 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2010-04-17 19:08:45 (GMT) |
| commit | 54a00f6992e20e7fdb8dd69f2b53e08bf7106be3 (patch) | |
| tree | b7d09901ba6224422a92063b3dd4787d374a8c35 /src/gui/text/qtextengine.cpp | |
| parent | 04fbaf8ed7cb3212917b8036c9da42552b97751a (diff) | |
| parent | 66620e60c9526baf0d3c7a7198e3ab15d9abc0f8 (diff) | |
| download | Qt-54a00f6992e20e7fdb8dd69f2b53e08bf7106be3.zip Qt-54a00f6992e20e7fdb8dd69f2b53e08bf7106be3.tar.gz Qt-54a00f6992e20e7fdb8dd69f2b53e08bf7106be3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into os1-4.7
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 6485966..d34553f 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -856,7 +856,7 @@ void QTextEngine::shapeLine(const QScriptLine &line) } } -extern int qt_defaultDpiY(); // in qfont.cpp +Q_GUI_EXPORT extern int qt_defaultDpiY(); // in qfont.cpp void QTextEngine::shapeText(int item) const { @@ -2494,7 +2494,7 @@ void QTextEngine::splitItem(int item, int pos) const // qDebug("split at position %d itempos=%d", pos, item); } -extern int qt_defaultDpiY(); +Q_GUI_EXPORT extern int qt_defaultDpiY(); QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const { |