diff options
| author | Mehul R. Patel <mehul_patel@indilogic.com> | 2009-09-02 03:16:35 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-02 03:16:35 (GMT) |
| commit | 9c831fc9a405dcfefbbf4bad09a8f95bd682c0eb (patch) | |
| tree | bc199e29b879522659faa6fcaf733e6a3d36b95d /src/declarative/fx | |
| parent | 8eed5aa528f668acfa1831432f97f7333c7d9e71 (diff) | |
| download | Qt-9c831fc9a405dcfefbbf4bad09a8f95bd682c0eb.zip Qt-9c831fc9a405dcfefbbf4bad09a8f95bd682c0eb.tar.gz Qt-9c831fc9a405dcfefbbf4bad09a8f95bd682c0eb.tar.bz2 | |
Fixed crash in keyPressed. keyToSignal function suppose to return “const QbyteArray” not “const char *”. Crash was coming because keyPressed was getting invalid memory pointer from keyToSignal function.
Merge-request: 1374
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/fx')
| -rw-r--r-- | src/declarative/fx/qfxitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index c436622..d28f531 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -928,7 +928,7 @@ private: virtual void keyPressed(QKeyEvent *event); virtual void keyReleased(QKeyEvent *event); - const char *keyToSignal(int key) { + const QByteArray keyToSignal(int key) { QByteArray keySignal; if (key >= Qt::Key_0 && key <= Qt::Key_9) { keySignal = "digit0Pressed"; |