diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-04 08:36:05 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-04 08:36:05 (GMT) |
| commit | 66aafe42f9076c0d70037ee8fad0e382828ed7bb (patch) | |
| tree | fb9206c3054afee866a44df685e0a20a319799ef /src | |
| parent | 004653e63b2c20f32750c54a609572329903d8be (diff) | |
| download | Qt-66aafe42f9076c0d70037ee8fad0e382828ed7bb.zip Qt-66aafe42f9076c0d70037ee8fad0e382828ed7bb.tar.gz Qt-66aafe42f9076c0d70037ee8fad0e382828ed7bb.tar.bz2 | |
Fix ordinal number conflict
Caused by previous merge conflict. Should have made it sequential.
Reviewed-by: TrustMe
Diffstat (limited to 'src')
| -rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 2 |
1 files changed, 1 insertions, 1 deletions
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 |