13 lines
756 B
Diff
13 lines
756 B
Diff
diff -up qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp.nullptr qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp
|
|
--- qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp.nullptr 2016-05-31 05:23:00.000000000 -0500
|
|
+++ qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp 2016-06-15 15:48:15.325108680 -0500
|
|
@@ -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();
|