Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 24 Apr 2010 04:21:43 +0000 (06:21 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 24 Apr 2010 04:21:43 +0000 (06:21 +0200)
commitc5212670f20f07733f16f00a318e0945b2721d22
treeae4eeec6f2b6a14f3623974db1481e2c40ab3953
parent9ea81cbc63db063cd30797fd265a9002430ebd2f
parenta1839a7a067c47a328c1bdb651a89dc325cb0691
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix for EGL for symbian on 3.1/3.2/5.0, define QT_NO_EGL.
  Stub implementations for EGL for symbian
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def