Do not crash on Symbian
authorJason McDonald <jason.mcdonald@nokia.com>
Fri, 29 Oct 2010 00:43:20 +0000 (10:43 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Fri, 29 Oct 2010 00:43:20 +0000 (10:43 +1000)
commit8250d455d8d85c5fe0c819f997ba0902315bfce4
treea645591db67cdb235a160e49ff154e3670c6f5a8
parent95b0b37704c97c5b4b48cd53c6592fc714c99828
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
(cherry picked from commit 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1)

Conflicts:

src/declarative/debugger/qdeclarativedebugservice.cpp
src/declarative/debugger/qdeclarativedebugservice.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def