From 55497edc83121317078d62083a835f2b794b37e4 Mon Sep 17 00:00:00 2001
From: Titta Heikkala <EXT-Titta.2.Heikkala@nokia.com>
Date: Thu, 28 Oct 2010 10:31:41 +0300
Subject: Fixed crash with QClipboard in Symbian^3

QClipboard now returns copied data outside TRAP to prevent TRAP levels
to get crossed.

Task-number: QTBUG-14790
Reviewed-by: Janne Koskinen

Merge-request: 897
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
---
 src/gui/kernel/qclipboard_s60.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
index c9b1d23..73280b2 100644
--- a/src/gui/kernel/qclipboard_s60.cpp
+++ b/src/gui/kernel/qclipboard_s60.cpp
@@ -257,18 +257,14 @@ const QMimeData* QClipboard::mimeData(Mode mode) const
                 }
             }
             CleanupStack::PopAndDestroy(cb);
-            if (dataExists) {
-                return d->source();
-            }
-            else {
-                return 0;
-            }
-
         });
         if (err != KErrNone){
             qDebug()<< "clipboard is empty/err: " << err;
         }
 
+        if (dataExists) {
+            return d->source();
+        }
     }
     return 0;
 }
-- 
cgit v0.12