Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	mkspecs/qnx-armv7le-qcc/qplatformdefs.h
	src/printsupport/kernel/qcups.cpp
	src/widgets/styles/qstyle.h
	tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp

Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267

1 files changed, 6 insertions, 3 deletions

diff --git a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
index 3064fd1320..5623990bd1 100644
--- a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
+++ b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
@@ -306,10 +306,13 @@ private slots:
     void QLoggingRegistry_checkErrors()
     {
         QLoggingSettingsParser parser;
-        QString warnMsg = QString("Ignoring malformed logging rule: '***=false'");
-        QTest::ignoreMessage(QtWarningMsg, warnMsg.toLocal8Bit().constData());
+        QTest::ignoreMessage(QtWarningMsg, "Ignoring malformed logging rule: '***=false'");
+        QTest::ignoreMessage(QtWarningMsg, "Ignoring malformed logging rule: '*=0'");
+        QTest::ignoreMessage(QtWarningMsg, "Ignoring malformed logging rule: '*=TRUE'");
         parser.setContent("[Rules]\n"
-                          "***=false\n");
+                          "***=false\n"
+                          "*=0\n"
+                          "*=TRUE\n");
         QVERIFY(parser.rules().isEmpty());
     }
 };