diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:54:42 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 21:09:54 +0100 |
| commit | 77567bad82081ffb166578bdeac52fb1f2dce464 (patch) | |
| tree | 149e70126cd4ae0e676feee3097596547c0952be /src/plugins/wmf | |
| parent | 24a1c04b69cec2d7aff70b4dc7e44a19313c62bf (diff) | |
| parent | 310271a4aa43aad9d8ca09154e5af5b1d6338fc4 (diff) | |
| download | qtmultimedia-77567bad82081ffb166578bdeac52fb1f2dce464.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/qnx/qnx.pro
sync.profile
Change-Id: I353a44578276264a9ffb80820d8c5a0babfa1638
Diffstat (limited to 'src/plugins/wmf')
| -rw-r--r-- | src/plugins/wmf/wmfserviceplugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/wmf/wmfserviceplugin.h b/src/plugins/wmf/wmfserviceplugin.h index 082358837..39b7b86d9 100644 --- a/src/plugins/wmf/wmfserviceplugin.h +++ b/src/plugins/wmf/wmfserviceplugin.h @@ -70,4 +70,4 @@ public: QString deviceDescription(const QByteArray &service, const QByteArray &device); }; -#endif // DSSERVICEPLUGIN_H +#endif // WMFSERVICEPLUGIN_H |