diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-04 16:03:02 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-04 16:03:02 (GMT) |
commit | b036e0c3b7c7094c666367000ca05047fc5d1003 (patch) | |
tree | 98f56e4def11e11cc52d524cdf7dad4e23dc86e3 /src/plugins | |
parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
parent | c85d2aa7e8d095221e1cc2b4aac2dcd4e9dee775 (diff) | |
download | Qt-b036e0c3b7c7094c666367000ca05047fc5d1003.zip Qt-b036e0c3b7c7094c666367000ca05047fc5d1003.tar.gz Qt-b036e0c3b7c7094c666367000ca05047fc5d1003.tar.bz2 |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
translations/translations.pri
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 |