diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-13 09:33:02 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-13 09:33:02 (GMT) |
| commit | e305732c0df93332a514a957b08e0ce283cb747f (patch) | |
| tree | 603522227e5d4e9f2994408afd5d5523951ba648 /src/openvg/openvg.pro | |
| parent | c93c9bbfe94cd271aeda9e2730d343e3eee31ec5 (diff) | |
| parent | a296749eaea94ae4ed36086b632d32c87d3d99c9 (diff) | |
| download | Qt-e305732c0df93332a514a957b08e0ce283cb747f.zip Qt-e305732c0df93332a514a957b08e0ce283cb747f.tar.gz Qt-e305732c0df93332a514a957b08e0ce283cb747f.tar.bz2 | |
Fixing merge conflicts.
Merge branch '4.7-upstream' into 4.7
Conflicts:
doc/src/declarative/advtutorial.qdoc
src/declarative/graphicsitems/qdeclarativeloader.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
Diffstat (limited to 'src/openvg/openvg.pro')
| -rw-r--r-- | src/openvg/openvg.pro | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro index 883f0f3..eb60331 100644 --- a/src/openvg/openvg.pro +++ b/src/openvg/openvg.pro @@ -17,7 +17,8 @@ HEADERS += \ qpixmapdata_vg_p.h \ qpixmapfilter_vg_p.h \ qvgcompositionhelper_p.h \ - qvgimagepool_p.h + qvgimagepool_p.h \ + qvgfontglyphcache_p.h SOURCES += \ qpaintengine_vg.cpp \ qpixmapdata_vg.cpp \ @@ -33,7 +34,11 @@ contains(QT_CONFIG, egl) { qwindowsurface_vgegl.cpp } -symbian: DEFINES += QVG_RECREATE_ON_SIZE_CHANGE QVG_BUFFER_SCROLLING +symbian { + DEFINES += QVG_RECREATE_ON_SIZE_CHANGE QVG_BUFFER_SCROLLING + SOURCES += \ + qvg_symbian.cpp +} include(../qbase.pri) |