summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qloggingcategory
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-02-14 13:36:38 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-15 21:57:43 +0100
commitc9cdbcb12f80cd72905e49ce1a673eae9f559ca3 (patch)
tree86af8aff149ad481bec976ae9d1ac3fce92e7ed7 /tests/auto/corelib/io/qloggingcategory
parent0bb6b65c56f49b93ca367f6771f10d3320dfc4f4 (diff)
Add const overload for QLoggingCategory::operator()()
Change 85e57653 caused a compile error for code that does Q_DECLARE_LOGGING_CATEGORY(cat); //.. qCDebug(cat()) << // ... error: C3848: expression having type 'const QLoggingCategory' would lose some const-volatile qualifiers in order to call 'QLoggingCategory &QLoggingCategory::operator ()(void)' This is a regression from Qt 5.2. Fix the error by adding a const version of operator()(). Change-Id: I2fb04f2e155962adee0f98089fc5a159000bef56 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/io/qloggingcategory')
-rw-r--r--tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
index 47a5d6044e..b0d7a76f0f 100644
--- a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
+++ b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
@@ -428,6 +428,8 @@ private slots:
QCOMPARE(logMessage, QString());
qCDebug(TST_LOG, "Check debug with no filter active");
QCOMPARE(logMessage, QString());
+ qCDebug(TST_LOG(), "Check debug with no filter active");
+ QCOMPARE(logMessage, QString());
buf = QStringLiteral("tst.log.warning: Check warning with no filter active");
qCWarning(TST_LOG) << "Check warning with no filter active";
QCOMPARE(logMessage, buf);