diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-05 23:17:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-05 23:17:44 (GMT) |
| commit | d6cb7c903069e1dfde3ffc69649354c97d160b68 (patch) | |
| tree | 98f56e4def11e11cc52d524cdf7dad4e23dc86e3 /src/plugins | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| parent | b036e0c3b7c7094c666367000ca05047fc5d1003 (diff) | |
| download | Qt-d6cb7c903069e1dfde3ffc69649354c97d160b68.zip Qt-d6cb7c903069e1dfde3ffc69649354c97d160b68.tar.gz Qt-d6cb7c903069e1dfde3ffc69649354c97d160b68.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
When one of the spin button subcontrol is activated, the state member of
fix crash in QLocalServer::close on Windows
QS60Style: QTabWidget icon size property doesn't work
PowerVR screen driver using undefined symbols
rename qt_iw.ts to qt_he.ts
QS60Style: QComboBoxPrivateScroller draws holes into menu canvas
QS60Style: QTabWidget Usability issue with capacitive screens
Fixing small memory leak in testlib.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp index 964fa53..9de2a34 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp @@ -259,7 +259,7 @@ int PvrEglScreen::transformation() const if (parent->classId() != QScreen::TransformedClass) return 0; return 90 * static_cast<const QTransformedScreen *>(parent) - ->transformation(); + ->transformOrientation(); } #else |