diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2017-07-24 12:56:48 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2017-07-26 09:11:05 +0000 |
| commit | 5952cb93cc93702124aaa5dec938581b0312761a (patch) | |
| tree | 3faacb12c145465915063a0852f843c4973300e5 /src/quick/scenegraph/qsgdefaultrendercontext.cpp | |
| parent | 39061af50cc3092289cdd71d17802139590ecb59 (diff) | |
Fix compilation with namespace
I am not sure why this hasn't failed in CI, but the function is
declared inside the namespace, so the definition needs to go in
there as well. Seems to be a merge error all the way back to 5.8.
Change-Id: Iedd25d3e9e756c55cc302da90bab11535bdc1b01
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultrendercontext.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultrendercontext.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp index e42979934e..b343f89cc0 100644 --- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp +++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp @@ -289,9 +289,6 @@ QSGDefaultRenderContext *QSGDefaultRenderContext::from(QOpenGLContext *context) return qobject_cast<QSGDefaultRenderContext *>(context->property(QSG_RENDERCONTEXT_PROPERTY).value<QObject *>()); } -QT_END_NAMESPACE - - QSGDistanceFieldGlyphCache *QSGDefaultRenderContext::distanceFieldGlyphCache(const QRawFont &font) { if (!m_distanceFieldCacheManager) @@ -306,4 +303,6 @@ QSGDistanceFieldGlyphCache *QSGDefaultRenderContext::distanceFieldGlyphCache(con return cache; } +QT_END_NAMESPACE + #include "moc_qsgdefaultrendercontext_p.cpp" |