summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-09-08 13:31:58 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-09-08 13:31:58 (GMT)
commitf05b4bf65c86bc9ba22f6504f4109d2b49dfd627 (patch)
treec60e36b6aa410e8f60e1ebf04559594766f42dce
parent46cb697b5e2eadfdad37aa6fcbdb58abf305de45 (diff)
downloadQt-f05b4bf65c86bc9ba22f6504f4109d2b49dfd627.zip
Qt-f05b4bf65c86bc9ba22f6504f4109d2b49dfd627.tar.gz
Qt-f05b4bf65c86bc9ba22f6504f4109d2b49dfd627.tar.bz2
Fix tst_qimage with QT_NO_EXCEPTIONS
-rw-r--r--tests/auto/qimage/tst_qimage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp
index ec0ecec..b446941 100644
--- a/tests/auto/qimage/tst_qimage.cpp
+++ b/tests/auto/qimage/tst_qimage.cpp
@@ -156,14 +156,14 @@ void tst_QImage::create()
{
bool cr = true;
#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE)
- try {
+ QT_TRY {
#endif
//QImage image(7000000, 7000000, 8, 256, QImage::IgnoreEndian);
QImage image(7000000, 7000000, QImage::Format_Indexed8);
image.setColorCount(256);
cr = !image.isNull();
#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE)
- } catch (...) {
+ } QT_CATCH (...) {
}
#endif
QVERIFY( !cr );