diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2010-10-28 17:49:55 (GMT) |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2010-10-28 17:49:55 (GMT) |
| commit | 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1 (patch) | |
| tree | 7070cd93fdf4cb6a4b6543ce2e4345d9acdeac1f /src/s60installs | |
| parent | 8d2fcb26e23d498e3e2efd600ad60a20fdba14c7 (diff) | |
| download | Qt-2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1.zip Qt-2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1.tar.gz Qt-2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1.tar.bz2 | |
Do not crash on Symbian
The qml debugging enabler in QtDeclarative made any Qt app crash
which used QDeclarative. Reason was that QtDeclarative.dll tried
to directly access (private) writable static data from QtGui.dll.
This patch adds an accessor function for the data to QtGui, and
the crash is gone.
Done-by: Kai Koehne
Reviewed-by: Kai Koehne
Conflicts:
src/declarative/debugger/qdeclarativedebugservice.cpp
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 4 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index aacc03a..afc89ae 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12890,8 +12890,10 @@ EXPORTS ?lastRightBearing@QFontEngine@@IAE?AUQFixed@@ABUQGlyphLayout@@_N@Z @ 12889 NONAME ; struct QFixed QFontEngine::lastRightBearing(struct QGlyphLayout const &, bool) ?childrenBoundingRectHelper@QGraphicsItemPrivate@@QAEXPAVQTransform@@PAVQRectF@@PAVQGraphicsItem@@@Z @ 12890 NONAME ; void QGraphicsItemPrivate::childrenBoundingRectHelper(class QTransform *, class QRectF *, class QGraphicsItem *) ?setTimeout@QTapAndHoldGesture@@SAXH@Z @ 12891 NONAME ; void QTapAndHoldGesture::setTimeout(int) - ?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ; class QString QApplicationPrivate::qmljsDebugArguments + ?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ABSENT ; class QString QApplicationPrivate::qmljsDebugArguments ?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@PAVQGraphicsItem@@@Z @ 12893 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(class QGraphicsItem *) const ?maxTextureHeight@QTextureGlyphCache@@UBEHXZ @ 12894 NONAME ; int QTextureGlyphCache::maxTextureHeight(void) const ?maxTextureWidth@QTextureGlyphCache@@UBEHXZ @ 12895 NONAME ; int QTextureGlyphCache::maxTextureWidth(void) const + ?qmljs_debug_arguments@QApplicationPrivate@@2VQString@@A @ 12896 NONAME ; class QString QApplicationPrivate::qmljs_debug_arguments + ?qmljsDebugArgumentsString@QApplicationPrivate@@SA?AVQString@@XZ @ 12897 NONAME ; class QString QApplicationPrivate::qmljsDebugArgumentsString(void) diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 4442d33..aa050f9 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12094,7 +12094,9 @@ EXPORTS _ZN18QTapAndHoldGesture7timeoutEv @ 12093 NONAME _ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFb @ 12094 NONAME ABSENT _ZN20QGraphicsItemPrivate14children_clearEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 12095 NONAME - _ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4 + _ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4 ABSENT _ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFP13QGraphicsItem @ 12097 NONAME _ZNK20QGraphicsItemPrivate21effectiveBoundingRectEP13QGraphicsItem @ 12098 NONAME + _ZN19QApplicationPrivate21qmljs_debug_argumentsE @ 12099 NONAME DATA 4 + _ZN19QApplicationPrivate25qmljsDebugArgumentsStringEv @ 12100 NONAME |