diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
| commit | 8e20daae9fee5f3b999daffce0d7156015ee974b (patch) | |
| tree | 7adcc397fd378cbb97c186ddb78c226b61906583 /src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h | |
| parent | 5545e5aa6e265469d278e1fb576a737535784422 (diff) | |
| parent | 694702e09d9b17d91db282784f009178cfb1059b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56
Diffstat (limited to 'src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h')
| -rw-r--r-- | src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h index b71fa64460..0397b20dfa 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h @@ -44,6 +44,8 @@ #include <QtCore/private/qabstractfileengine_p.h> #include "qiosfileengineassetslibrary.h" +QT_BEGIN_NAMESPACE + class QIOSFileEngineFactory : public QAbstractFileEngineHandler { public: @@ -58,4 +60,6 @@ public: } }; +QT_END_NAMESPACE + #endif // QIOSFILEENGINEFACTORY_H |