summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-12 16:19:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-12 16:19:21 (GMT)
commit372df5569dbd114efbaacf349e0ae6cadc0138cc (patch)
treef9527038e334031cdfbb048b42c1f0ae74049956 /src
parent89be252042955a01a17baa91f2d318cbb2d2a5a4 (diff)
parentc03ecbc6163089f8eb73c97b7bfd05ab6269a278 (diff)
downloadQt-372df5569dbd114efbaacf349e0ae6cadc0138cc.zip
Qt-372df5569dbd114efbaacf349e0ae6cadc0138cc.tar.gz
Qt-372df5569dbd114efbaacf349e0ae6cadc0138cc.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix wins def file for qtgui Compilation fix for Metrowerks compiler
Diffstat (limited to 'src')
-rw-r--r--src/s60installs/bwins/QtGuiu.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index c7a23fb..88427ec 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12597,7 +12597,7 @@ EXPORTS
?setConfig@QEglContext@@QAEXH@Z @ 12596 NONAME ; void QEglContext::setConfig(int)
?hasExtension@QEglContext@@SA_NPBD@Z @ 12597 NONAME ABSENT ; bool QEglContext::hasExtension(char const *)
?doneCurrent@QEglContext@@QAE_NXZ @ 12598 NONAME ; bool QEglContext::doneCurrent(void)
- ?display@QEglContext@@QBEHXZ @ 12599 NONAME ; int QEglContext::display(void) const
+ ?display@QEglContext@@QBEHXZ @ 12599 NONAME ABSENT ; int QEglContext::display(void) const
?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12600 NONAME ; void QEglProperties::setPixelFormat(enum QImage::Format)
?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12601 NONAME ; class QEglContext * QEglContext::currentContext(enum QEgl::API)
?errorString@QEglContext@@SA?AVQString@@H@Z @ 12602 NONAME ; class QString QEglContext::errorString(int)