From 1df147d5337622ea979eb1319c97d8278b70d864 Mon Sep 17 00:00:00 2001 From: Ralf Nolden Date: Tue, 17 May 2016 12:47:59 +0200 Subject: Make qtmultimedia 5.6 branch compile without c++11:nullptr usage 5.6 should not require c++11 features, however, nullptr slipped in here. Replace nullptr with Q_NULLPTR for initialization. Change-Id: Icf62618657b5bb725bd4c8f924853fa191f6e413 Reviewed-by: Simon Hausmann --- src/gsttools/qgstreamerbushelper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gsttools') diff --git a/src/gsttools/qgstreamerbushelper.cpp b/src/gsttools/qgstreamerbushelper.cpp index 03cf64ba8..4e007c9e6 100644 --- a/src/gsttools/qgstreamerbushelper.cpp +++ b/src/gsttools/qgstreamerbushelper.cpp @@ -52,7 +52,7 @@ public: m_tag(0), m_bus(bus), m_helper(parent), - m_intervalTimer(nullptr) + m_intervalTimer(Q_NULLPTR) { // glib event loop can be disabled either by env variable or QT_NO_GLIB define, so check the dispacher QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher(); -- cgit v1.2.3