summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-09-12 10:42:25 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-14 15:23:15 +0200
commit1dd4790aeef17f056840bfea6c438075adbaaa03 (patch)
tree736429b2f1a1cfa31c2ab739dc51da51c0867b20 /tests/auto/gui
parent14f7eb86ca2275d91f284279af5f77205d4ae3c0 (diff)
Autotests: Use qInstallMessageHandler
qInstallMsgHandler got deprecated in Qt 5. Change-Id: Ib36983e66b3a8090b99f14e3fd4e210602a3f018 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/painting/qpainter/tst_qpainter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 3d0ec9f425..14e83adfd0 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -2410,7 +2410,7 @@ public:
static bool success;
-void porterDuff_warningChecker(QtMsgType type, const char *msg)
+void porterDuff_warningChecker(QtMsgType type, const QMessageLogContext &, const QString &msg)
{
if (type == QtWarningMsg && msg == QLatin1String("QPainter::setCompositionMode: PorterDuff modes not supported on device"))
success = false;
@@ -2418,7 +2418,7 @@ void porterDuff_warningChecker(QtMsgType type, const char *msg)
void tst_QPainter::porterDuff_warning()
{
- QtMsgHandler old = qInstallMsgHandler(porterDuff_warningChecker);
+ QtMessageHandler old = qInstallMessageHandler(porterDuff_warningChecker);
DummyPaintEngine dummy;
QPainter p(&dummy);
@@ -2434,7 +2434,7 @@ void tst_QPainter::porterDuff_warning()
p.setCompositionMode(QPainter::CompositionMode_DestinationOver);
QVERIFY(!success);
- QVERIFY(qInstallMsgHandler(old) == porterDuff_warningChecker);
+ QVERIFY(qInstallMessageHandler(old) == porterDuff_warningChecker);
}
class quint24