slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make qtmultimedia 5.6 branch compile without c++11:nullptr usage

Browse Source 
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 <simon.hausmann@theqtcompany.com>
This commit is contained in:
Ralf Nolden
2016-05-17 12:47:59 +02:00
parent 15951e672e
commit 1df147d533
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gsttools/qgstreamerbushelper.cpp
View File

@@ -52,7 +52,7 @@ public:
m_tag(0), m_tag(0),
m_bus(bus), m_bus(bus),
m_helper(parent), 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 // glib event loop can be disabled either by env variable or QT_NO_GLIB define, so check the dispacher
QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher(); QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher();