diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-22 10:18:16 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-22 10:18:16 (GMT) |
| commit | 88ebb57019913958771416261206d9daa77fc4aa (patch) | |
| tree | 44950a191d27dd51881088737cf19154a774f8bb /src/gui/text/qfontengine_win_p.h | |
| parent | 84a342eea111f0a1da8fd0c417362aae2b851e56 (diff) | |
| parent | 9e85af3454bd0a2d962523d52e688f9bc7259528 (diff) | |
| download | Qt-88ebb57019913958771416261206d9daa77fc4aa.zip Qt-88ebb57019913958771416261206d9daa77fc4aa.tar.gz Qt-88ebb57019913958771416261206d9daa77fc4aa.tar.bz2 | |
Merge remote-tracking branch 'mainline/master'
Conflicts:
src/gui/image/qpnghandler.cpp
Diffstat (limited to 'src/gui/text/qfontengine_win_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_win_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_win_p.h b/src/gui/text/qfontengine_win_p.h index 22085e8..28d8000 100644 --- a/src/gui/text/qfontengine_win_p.h +++ b/src/gui/text/qfontengine_win_p.h @@ -150,7 +150,7 @@ private: class QFontEngineMultiWin : public QFontEngineMulti { public: - QFontEngineMultiWin(QFontEngineWin *first, const QStringList &fallbacks); + QFontEngineMultiWin(QFontEngine *first, const QStringList &fallbacks); void loadEngine(int at); QStringList fallbacks; |