From 66aafe42f9076c0d70037ee8fad0e382828ed7bb Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Wed, 4 May 2011 10:36:05 +0200 Subject: Fix ordinal number conflict Caused by previous merge conflict. Should have made it sequential. Reviewed-by: TrustMe --- src/s60installs/eabi/QtGuiu.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 1914e1f..318b394 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12183,5 +12183,5 @@ EXPORTS _ZN15QGraphicsSystem22releaseCachedResourcesEv @ 12182 NONAME _Z32qt_s60_setPartialScreenInputModeb @ 12183 NONAME _Z29qt_draw_decoration_for_glyphsP8QPainterPKjPK11QFixedPointiP11QFontEngineRK5QFontRK15QTextCharFormat @ 12184 NONAME - _ZNK14QVolatileImage14paintingActiveEv @ 12186 NONAME + _ZNK14QVolatileImage14paintingActiveEv @ 12185 NONAME -- cgit v0.12