diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-22 11:08:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:19:57 +0200 |
| commit | 28628a5d5e6c55512759ceafc644aa31e444b781 (patch) | |
| tree | 221d1ab0995afe0d441f1ddb433aee985f6d41ea /src/plugins/platforms/eglfs/qeglfshooks.cpp | |
| parent | cbb2ba23e203374132e4b134b1c8f1a3626d2378 (diff) | |
| parent | 686c44a69b13f6e884dd2b6d9991f4cd94597c5a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/eglfs/qeglfshooks.cpp
Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2
Diffstat (limited to 'src/plugins/platforms/eglfs/qeglfshooks.cpp')
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfshooks.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfshooks.cpp b/src/plugins/platforms/eglfs/qeglfshooks.cpp index 87285428df..7345cfd1f1 100644 --- a/src/plugins/platforms/eglfs/qeglfshooks.cpp +++ b/src/plugins/platforms/eglfs/qeglfshooks.cpp @@ -66,7 +66,8 @@ private: Q_GLOBAL_STATIC(DeviceIntegration, deviceIntegration) -DeviceIntegration::DeviceIntegration() : m_integration(0) +DeviceIntegration::DeviceIntegration() + : m_integration(nullptr) { QStringList pluginKeys = QEGLDeviceIntegrationFactory::keys(); if (!pluginKeys.isEmpty()) { |