diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-11-06 01:39:04 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-11-06 01:39:04 (GMT) |
commit | faa534e55b9a03dabc44565e45f2f19297edf29d (patch) | |
tree | 58251be0a19dc833d2ed96460edb2509508ba11c /src/plugins | |
parent | e0a373e135f81885c97d13dab40b58eb454e34e2 (diff) | |
download | Qt-faa534e55b9a03dabc44565e45f2f19297edf29d.zip Qt-faa534e55b9a03dabc44565e45f2f19297edf29d.tar.gz Qt-faa534e55b9a03dabc44565e45f2f19297edf29d.tar.bz2 |
Fix bad merge from 4.5 in powervr code
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp index c1410a6..1dec9ea 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp @@ -271,67 +271,6 @@ int PvrEglScreen::transformation() const #endif -#ifndef QT_NO_QWS_TRANSFORMED - -static const QScreen *parentScreen - (const QScreen *current, const QScreen *lookingFor) -{ - if (!current) - return 0; - switch (current->classId()) { - case QScreen::ProxyClass: - case QScreen::TransformedClass: { - const QScreen *child = - static_cast<const QProxyScreen *>(current)->screen(); - if (child == lookingFor) - return current; - else - return parentScreen(child, lookingFor); - } - // Not reached. - - case QScreen::MultiClass: { - QList<QScreen *> screens = current->subScreens(); - foreach (QScreen *screen, screens) { - if (screen == lookingFor) - return current; - const QScreen *parent = parentScreen(screen, lookingFor); - if (parent) - return parent; - } - } - break; - - default: break; - } - return 0; -} - -int PvrEglScreen::transformation() const -{ - // We need to search for our parent screen, which is assumed to be - // "Transformed". If it isn't, then there is no transformation. - // There is no direct method to get the parent screen so we need - // to search every screen until we find ourselves. - if (!parent && qt_screen != this) - parent = parentScreen(qt_screen, this); - if (!parent) - return 0; - if (parent->classId() != QScreen::TransformedClass) - return 0; - return 90 * static_cast<const QTransformedScreen *>(parent) - ->transformation(); -} - -#else - -int PvrEglScreen::transformation() const -{ - return 0; -} - -#endif - void PvrEglScreen::sync() { // Put code here to synchronize 2D and 3D operations if necessary. |