summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-09-12 07:49:03 +0200
committerGunnar Sletta <gunnar.sletta@nokia.com>2011-09-12 07:49:03 +0200
commita9ac6da893ac10ce160c9eb80141508881cd71e2 (patch)
tree0e74067407612d44ad07ff74cb7be6d444ee28c5 /tests/auto/corelib
parent8eb5ba3b9cb1e8e07f28a3153672a946b2d82fd9 (diff)
parent687461627310e8b781da15d1a907c35bd8ffea6e (diff)
Merge branch 'master' into refactor
Conflicts: src/3rdparty/v8 src/gui/text/qfont_qpa.cpp src/gui/widgets/qlinecontrol.cpp src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp tests/auto/gui.pro tests/auto/network.pro tests/auto/qstring/tst_qstring.cpp Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/global/qglobal/tst_qglobal.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
index 19a13f6ad0..85aa03f642 100644
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -213,7 +213,7 @@ void tst_QGlobal::qtry()
// check propper if/else scoping
i = 0;
- if (true)
+ if (true) {
QT_TRY {
i = 2;
QT_THROW(42);
@@ -222,12 +222,13 @@ void tst_QGlobal::qtry()
QCOMPARE(i, 2);
i = 4;
}
- else
+ } else {
QCOMPARE(i, 0);
+ }
QCOMPARE(i, 4);
i = 0;
- if (false)
+ if (false) {
QT_TRY {
i = 2;
QT_THROW(42);
@@ -236,14 +237,15 @@ void tst_QGlobal::qtry()
QCOMPARE(i, 2);
i = 2;
}
- else
+ } else {
i = 8;
+ }
QCOMPARE(i, 8);
i = 0;
- if (false)
+ if (false) {
i = 42;
- else
+ } else {
QT_TRY {
i = 2;
QT_THROW(42);
@@ -252,6 +254,7 @@ void tst_QGlobal::qtry()
QCOMPARE(i, 2);
i = 4;
}
+ }
QCOMPARE(i, 4);
}