diff options
author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-09-17 15:25:08 (GMT) |
---|---|---|
committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-09-17 15:25:08 (GMT) |
commit | 1d05c5221ba8ad3f5d3d36ba2025ea45bc3afe88 (patch) | |
tree | 6cba08738ce9fcdb0d1d8d7417b336a8521f36a1 /src/gui/painting | |
parent | b7923d48fb6d755d4563eeed0e7f3cbc774d69d5 (diff) | |
parent | 0db5ca5c733422b28524791b4f292227a61090d2 (diff) | |
download | Qt-1d05c5221ba8ad3f5d3d36ba2025ea45bc3afe88.zip Qt-1d05c5221ba8ad3f5d3d36ba2025ea45bc3afe88.tar.gz Qt-1d05c5221ba8ad3f5d3d36ba2025ea45bc3afe88.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
tests/auto/qtwidgets/tst_qtwidgets.cpp
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/painting.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 5abac2f..8343cb9 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -22,6 +22,7 @@ HEADERS += \ painting/qpainter_p.h \ painting/qpainterpath.h \ painting/qpainterpath_p.h \ + painting/qvectorpath_p.h \ painting/qpathclipper_p.h \ painting/qpdf_p.h \ painting/qpen.h \ |