diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qcoloringmessagehandler.cpp | 3 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qcoloroutput_p.h | 1 | ||||
| -rw-r--r-- | tests/auto/qsourcelocation/tst_qsourcelocation.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index d27ea42..7fcbf65 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.4.2 +MODULE_VERSION = 5.5.0 diff --git a/src/xmlpatterns/api/qcoloringmessagehandler.cpp b/src/xmlpatterns/api/qcoloringmessagehandler.cpp index 942d9df..86d2345 100644 --- a/src/xmlpatterns/api/qcoloringmessagehandler.cpp +++ b/src/xmlpatterns/api/qcoloringmessagehandler.cpp @@ -130,9 +130,10 @@ void ColoringMessageHandler::handleMessage(QtMsgType type, case QtCriticalMsg: /* Fallthrough. */ case QtDebugMsg: + case QtInfoMsg: { Q_ASSERT_X(false, Q_FUNC_INFO, - "message() is not supposed to receive QtCriticalMsg or QtDebugMsg."); + "message() is not supposed to receive QtCriticalMsg, QtInfoMsg or QtDebugMsg."); return; } } diff --git a/src/xmlpatterns/api/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h index 0278d61..9f193b1 100644 --- a/src/xmlpatterns/api/qcoloroutput_p.h +++ b/src/xmlpatterns/api/qcoloroutput_p.h @@ -60,7 +60,6 @@ namespace QPatternist ForegroundShift = 10, BackgroundShift = 20, SpecialShift = 20, -// ### FIXME: this looks very suspicious. Make ForegroundShift = 0x10 etc? ForegroundMask = 0x1f << ForegroundShift, BackgroundMask = 0x7 << BackgroundShift }; diff --git a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp index 9b35d3d..ee7d0a2 100644 --- a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp +++ b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp @@ -361,14 +361,14 @@ void tst_QSourceLocation::debugStream_data() const { QTest::newRow("Default constructed instance") << QSourceLocation() - << QString::fromLatin1("QSourceLocation( QUrl( \"\" ) , line: -1 , column: -1 ) "); + << QString::fromLatin1("QSourceLocation( QUrl(\"\") , line: -1 , column: -1 ) "); } { QSourceLocation location(QUrl(QLatin1String("http://example.com/")), 4, 5); QTest::newRow("Properties set") << location - << QString::fromLatin1("QSourceLocation( QUrl( \"http://example.com/\" ) , line: 4 , column: 5 ) "); + << QString::fromLatin1("QSourceLocation( QUrl(\"http://example.com/\") , line: 4 , column: 5 ) "); } } |