Remove Q_ASSERT from QSharedPointer autotest
authorJason McDonald <jason.mcdonald@nokia.com>
Tue, 3 May 2011 06:14:03 +0000 (16:14 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 18 May 2011 00:46:43 +0000 (10:46 +1000)
Report a meaningful fatal error instead of aborting in debug mode builds
and failing silently in release mode builds.

Change-Id: I0f939dc40810f072a3e24aeba085191793c49ef3
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit b988b2f9f04ac0ebce7a779cd9bd5d394bfa1c95)

tests/auto/qsharedpointer/tst_qsharedpointer.cpp

index bb04621..96d0873 100644 (file)
@@ -139,7 +139,8 @@ public:
 
     virtual ~Data()
     {
-        Q_ASSERT_X(generation > 0, "tst_QSharedPointer", "Double deletion!");
+        if (generation <= 0)
+            qFatal("tst_qsharedpointer: Double deletion!");
         generation = 0;
         ++destructorCounter;
     }