summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qmetadatacontrolmetaobject.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-24 04:21:43 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-24 04:21:43 (GMT)
commitc5212670f20f07733f16f00a318e0945b2721d22 (patch)
treeae4eeec6f2b6a14f3623974db1481e2c40ab3953 /src/imports/multimedia/qmetadatacontrolmetaobject.cpp
parent9ea81cbc63db063cd30797fd265a9002430ebd2f (diff)
parenta1839a7a067c47a328c1bdb651a89dc325cb0691 (diff)
downloadQt-c5212670f20f07733f16f00a318e0945b2721d22.zip
Qt-c5212670f20f07733f16f00a318e0945b2721d22.tar.gz
Qt-c5212670f20f07733f16f00a318e0945b2721d22.tar.bz2
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
Diffstat (limited to 'src/imports/multimedia/qmetadatacontrolmetaobject.cpp')
0 files changed, 0 insertions, 0 deletions