diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-11 12:39:09 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-11 12:39:09 +0200 |
| commit | 5e2b0aa1b344bc93af29d7977aa7e497bfc7a9cf (patch) | |
| tree | c478b00d1c04166f3c1c163971edb4575b065b13 /src/gui/text/text.pri | |
| parent | d1622207ba501b93bd83b88d61a5631d3d0da0cc (diff) | |
| parent | fda40e37df1152b5a8c572fe4bc53620bfcbcc45 (diff) | |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/gui/painting/qdrawhelper_p.h
src/gui/painting/qgraphicssystemfactory.cpp
src/gui/painting/qpainter.cpp
src/gui/painting/qunifiedtoolbarsurface_mac.cpp
src/gui/painting/qunifiedtoolbarsurface_mac_p.h
src/openvg/openvg.pro
src/openvg/qpaintengine_vg.cpp
src/openvg/qwindowsurface_vg.cpp
src/openvg/qwindowsurface_vgegl.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/widgets/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'src/gui/text/text.pri')
| -rw-r--r-- | src/gui/text/text.pri | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 24f9c5f0e4..6357dec1d2 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -38,10 +38,10 @@ HEADERS += \ text/qtextodfwriter_p.h \ text/qstatictext_p.h \ text/qstatictext.h \ - text/qglyphs.h \ - text/qglyphs_p.h \ text/qrawfont.h \ - text/qrawfont_p.h + text/qrawfont_p.h \ + text/qglyphrun.h \ + text/qglyphrun_p.h SOURCES += \ text/qfont.cpp \ @@ -71,8 +71,8 @@ SOURCES += \ text/qzip.cpp \ text/qtextodfwriter.cpp \ text/qstatictext.cpp \ - text/qglyphs.cpp \ - text/qrawfont.cpp + text/qrawfont.cpp \ + text/qglyphrun.cpp win32 { SOURCES += \ |