diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 23:53:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 23:53:41 (GMT) |
| commit | 09c2a804b700ec51f44bda567b806181d00bc161 (patch) | |
| tree | 8a4752daf2aa95d7879b782f807dc30c23216b3b /src/gui/painting | |
| parent | f9ca0df998a8a3a942816f2954603ad996210d8d (diff) | |
| parent | e1653cf50426d979447c6dcde44a3ab21988cc49 (diff) | |
| download | Qt-09c2a804b700ec51f44bda567b806181d00bc161.zip Qt-09c2a804b700ec51f44bda567b806181d00bc161.tar.gz Qt-09c2a804b700ec51f44bda567b806181d00bc161.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (192 commits)
Fix dependency so it works also on massive parrallel systems
This should likely get webkit linking again on windows/sbsv2
Fixed Symbian applications with DESTDIR set.
Removed a warning about generated rss files.
Revert "Temporarily disable problematic dll."
Fixed "Cannot install protected application" message on Symbian.
Worked around a crash in the elf2e32 postlinker tool.
Worked around case differences in Symbian^3 and Gnupoc.
Enabled compilation of plugins again.
Fixed a building bug where the DLL entry point was undefined.
Moved UID2 processing from cpp code to profiles.
Added rpp and rsg files to ignore filter.
Moved two profiles to the correct directory.
Fix build break caused by undefined symbol SetDialogPreference
Temporarily disable problematic dll.
Use the same concept for per-lib tweaks as armcc
Consistently use the * in configure
Symbian doesn't have large file support currently, just turn it off
Remove largefile config test
Make sure that we have all compile flags available always
...
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 |