diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-19 05:04:27 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-19 05:04:27 (GMT) |
| commit | cd62795fc3282e34d0f37c935a5ec1c45e4eb483 (patch) | |
| tree | 816c2ae34cc4e04fc9c157cf4de3bfd6cd22dd64 /src/gui/painting | |
| parent | 668663d9f632f151d86dda77cb6ac22fe13b18a5 (diff) | |
| parent | fd520c032eabab22acfabe9ffdc5929e168a279f (diff) | |
| download | Qt-cd62795fc3282e34d0f37c935a5ec1c45e4eb483.zip Qt-cd62795fc3282e34d0f37c935a5ec1c45e4eb483.tar.gz Qt-cd62795fc3282e34d0f37c935a5ec1c45e4eb483.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qwindowsurface_s60.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp index d05c7e4..b25dce5 100644 --- a/src/gui/painting/qwindowsurface_s60.cpp +++ b/src/gui/painting/qwindowsurface_s60.cpp @@ -44,8 +44,8 @@ #include <QtGui/qpaintdevice.h> #include <private/qwidget_p.h> #include "qwindowsurface_s60_p.h" -#include "qpixmap_s60_p.h" -#include "qt_s60_p.h" +#include <private/qpixmap_s60_p.h> +#include <private/qt_s60_p.h> #include "private/qdrawhelper_p.h" QT_BEGIN_NAMESPACE |