summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-05-12 14:07:24 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-05-12 14:12:51 (GMT)
commitc03ecbc6163089f8eb73c97b7bfd05ab6269a278 (patch)
tree6001ec3c130d4c9cffaf31ad5f59dc20ecb0e9c3
parent84d781ace01ef8a413616ec83d0a4513beda1ca5 (diff)
downloadQt-c03ecbc6163089f8eb73c97b7bfd05ab6269a278.zip
Qt-c03ecbc6163089f8eb73c97b7bfd05ab6269a278.tar.gz
Qt-c03ecbc6163089f8eb73c97b7bfd05ab6269a278.tar.bz2
Fix wins def file for qtgui
The .def file contained symbols for both: public: static int __cdecl QEglContext::display(void) public: int __thiscall QEglContext::display(void) const But the autogenerated def file comments showed both of these as just QEglContext::display(void) Leading to confusion. There is some bug in SBSv2 which made the postlink succeed on retry. Task-number: QTBUG-10520 Reviewed-by: Trust Me
-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)