summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-03 22:45:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-03 22:45:53 (GMT)
commit06531e1ad01ce7ecdc35577575b65b8b3a84483a (patch)
tree0b0c720509a416761db04021203ab51899a22b25 /src
parent43c18f3a394405a1429098db49918df08713fa4a (diff)
parentb4624855cf9cb5ea3f3d8bb2cb510cfa4e0e9076 (diff)
downloadQt-06531e1ad01ce7ecdc35577575b65b8b3a84483a.zip
Qt-06531e1ad01ce7ecdc35577575b65b8b3a84483a.tar.gz
Qt-06531e1ad01ce7ecdc35577575b65b8b3a84483a.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: PowerVR screen driver using undefined symbols
Diffstat (limited to 'src')
-rw-r--r--src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp2
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