diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:07:41 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:07:49 +0200 |
commit | a0ee969c8d2f74382c0a8c9c77642d48a602577f (patch) | |
tree | 3b60a19041a3ae0cb896e9bd37c9277f2aa7fcc0 /src/gsttools | |
parent | 47e583a6b82a6b678f2ca2a621176ad40eeab95d (diff) | |
parent | 9ee131c416eb3a876c4072a29976cc56623aabc7 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib95ddbbc6e2b69663597cae045ec81eda6d12d58
Diffstat (limited to 'src/gsttools')
-rw-r--r-- | src/gsttools/qgstreamerbushelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gsttools/qgstreamerbushelper.cpp b/src/gsttools/qgstreamerbushelper.cpp index bd35d4b0a..89b2c4ae7 100644 --- a/src/gsttools/qgstreamerbushelper.cpp +++ b/src/gsttools/qgstreamerbushelper.cpp @@ -58,7 +58,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(); |