diff options
| author | Ralf Nolden <nolden@kde.org> | 2016-05-17 12:47:59 +0200 |
|---|---|---|
| committer | Ralf Nolden <nolden@kde.org> | 2016-05-17 11:45:23 +0000 |
| commit | 1df147d5337622ea979eb1319c97d8278b70d864 (patch) | |
| tree | eb8520a0a9961358b24c7de27b9942ce6ad55097 /src/gsttools | |
| parent | 15951e672eaf38537c82043b0b9b14088facbd19 (diff) | |
| download | qtmultimedia-1df147d5337622ea979eb1319c97d8278b70d864.tar.gz | |
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 <simon.hausmann@theqtcompany.com>
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 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(); |