diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-25 03:04:03 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-25 03:04:03 +0100 |
commit | 20810bf9abfdcbb1b1d335849d9cf018f4fbe019 (patch) | |
tree | b70090462a6817dcba14344a8474821e3a64c0d6 /tests/auto/qknxcontrolfield/tst_qknxcontrolfield.cpp | |
parent | 57247314d5c9ce2ca711d1dbe4a0ae1f3714e997 (diff) | |
parent | 3c6e84d7b39014d5df6750f096bc31a5b24e164b (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Iee335e2e658b2531aaea6d8774cf34c6b6812b2a
Diffstat (limited to 'tests/auto/qknxcontrolfield/tst_qknxcontrolfield.cpp')
-rw-r--r-- | tests/auto/qknxcontrolfield/tst_qknxcontrolfield.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/qknxcontrolfield/tst_qknxcontrolfield.cpp b/tests/auto/qknxcontrolfield/tst_qknxcontrolfield.cpp index 594eec9..546fdac 100644 --- a/tests/auto/qknxcontrolfield/tst_qknxcontrolfield.cpp +++ b/tests/auto/qknxcontrolfield/tst_qknxcontrolfield.cpp @@ -31,12 +31,6 @@ #include <QtKnx/qknxextendedcontrolfield.h> #include <QtTest/qtest.h> -static QString s_msg; -static void myMessageHandler(QtMsgType, const QMessageLogContext &, const QString &msg) -{ - s_msg = msg; -} - class tst_QKnxControlField : public QObject { Q_OBJECT |