diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 14:03:22 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 14:17:53 +0100 |
| commit | 19095f432ef7ef424ea8dc89b19e43ed9f031b3e (patch) | |
| tree | 159654fbd2066eaea6d6fe78efc9726b5959eb3d /src/gui/text/text.pri | |
| parent | 196e1484c22f6347061fa433987a86d90e178a55 (diff) | |
| parent | 236c3ad7bacf165069b834b62fede6b147cfaf03 (diff) | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
configure
src/gui/egl/qegl.cpp
src/gui/kernel/qdnd_p.h
Diffstat (limited to 'src/gui/text/text.pri')
| -rw-r--r-- | src/gui/text/text.pri | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index a6b50847a0..f1d5534726 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -37,7 +37,9 @@ HEADERS += \ text/qtexttable_p.h \ text/qzipreader_p.h \ text/qzipwriter_p.h \ - text/qtextodfwriter_p.h + text/qtextodfwriter_p.h \ + text/qstatictext_p.h \ + text/qstatictext.h SOURCES += \ text/qfont.cpp \ @@ -66,7 +68,8 @@ SOURCES += \ text/qsyntaxhighlighter.cpp \ text/qcssparser.cpp \ text/qzip.cpp \ - text/qtextodfwriter.cpp + text/qtextodfwriter.cpp \ + text/qstatictext.cpp win32 { SOURCES += \ |