diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 21:02:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 21:02:48 (GMT) |
| commit | 2c0c51e00f5fa7184494df5940a3a389f52bf5e3 (patch) | |
| tree | e1f1ec518f893f310046a159618b2b864b1b19b1 /src/gui | |
| parent | 7f3d9a76e9d956d9e7e4398ac20785070e214958 (diff) | |
| parent | 32e532743dc6243612ade017e8c326ca0e7e0dec (diff) | |
| download | Qt-2c0c51e00f5fa7184494df5940a3a389f52bf5e3.zip Qt-2c0c51e00f5fa7184494df5940a3a389f52bf5e3.tar.gz Qt-2c0c51e00f5fa7184494df5940a3a389f52bf5e3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Compiler warnings (unused variables).
Compiler warnings.
Fix crash with large ClientCutMessage
Fix crash at exit and out of bounds write
fix issue wrt posted events on Windows CE
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qgraphicssystem_runtime_p.h | 2 | ||||
| -rw-r--r-- | src/gui/painting/qoutlinemapper_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime_p.h b/src/gui/painting/qgraphicssystem_runtime_p.h index 445f83d..101a8e7 100644 --- a/src/gui/painting/qgraphicssystem_runtime_p.h +++ b/src/gui/painting/qgraphicssystem_runtime_p.h @@ -170,7 +170,7 @@ public: int windowSurfaceDestroyPolicy() const { return m_windowSurfaceDestroyPolicy; } - int memoryUsage() const { return m_memoryUsage; } + uint memoryUsage() const { return m_memoryUsage; } private: diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h index f64d03b..d534f76 100644 --- a/src/gui/painting/qoutlinemapper_p.h +++ b/src/gui/painting/qoutlinemapper_p.h @@ -95,8 +95,8 @@ public: m_tags(0), m_contours(0), m_polygon_dev(0), - m_round_coords(false), - m_in_clip_elements(false) + m_in_clip_elements(false), + m_round_coords(false) { } |