summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_p.h
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@nokia.com>2010-10-28 17:49:55 (GMT)
committerAlessandro Portale <alessandro.portale@nokia.com>2010-10-28 17:49:55 (GMT)
commit2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1 (patch)
tree7070cd93fdf4cb6a4b6543ce2e4345d9acdeac1f /src/gui/kernel/qapplication_p.h
parent8d2fcb26e23d498e3e2efd600ad60a20fdba14c7 (diff)
downloadQt-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/gui/kernel/qapplication_p.h')
-rw-r--r--src/gui/kernel/qapplication_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 9c5095d..a0e1452 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -446,7 +446,8 @@ public:
static bool animate_toolbox;
static bool widgetCount; // Coupled with -widgetcount switch
static bool load_testability; // Coupled with -testability switch
- static QString qmljsDebugArguments; // a string containing arguments for js/qml debugging.
+ static QString qmljs_debug_arguments; // a string containing arguments for js/qml debugging.
+ static QString qmljsDebugArgumentsString(); // access string from other libraries
#ifdef Q_WS_MAC
static bool native_modal_dialog_active;