diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:15:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:15:38 +0200 |
| commit | 30a4041893c8132040cd982c9ca1204345801750 (patch) | |
| tree | 39d35ef5a52becbf833608b8c86cd0c5bf8fe837 /src/xmlpatterns/api/qxmlquery_p.h | |
| parent | e0207675f2cb28713c9cfce1ecc5854a082d3d2c (diff) | |
| parent | c0b6fbcadbefcc8a91e5db7fd98662dddcd7a0f8 (diff) | |
| download | qtxmlpatterns-30a4041893c8132040cd982c9ca1204345801750.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I0653ca8dd6a9b6ee2314911c7679a1c056dc3709
Diffstat (limited to 'src/xmlpatterns/api/qxmlquery_p.h')
| -rw-r--r-- | src/xmlpatterns/api/qxmlquery_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/api/qxmlquery_p.h b/src/xmlpatterns/api/qxmlquery_p.h index 731d736..1759fa2 100644 --- a/src/xmlpatterns/api/qxmlquery_p.h +++ b/src/xmlpatterns/api/qxmlquery_p.h @@ -104,7 +104,7 @@ public: { const QPatternist::AccelTreeResourceLoader::Ptr nev(new QPatternist::AccelTreeResourceLoader(namePool.d, m_networkAccessDelegator)); - m_resourceLoader = QPatternist::ResourceLoader::Ptr(new QPatternist::ResourceDelegator(m_resourceLoader->deviceURIs(), + m_resourceLoader = QPatternist::DeviceResourceLoader::Ptr(new QPatternist::ResourceDelegator(m_resourceLoader->deviceURIs(), m_resourceLoader, nev)); } @@ -128,7 +128,7 @@ public: return m_variableLoader; } - inline QPatternist::GenericStaticContext::Ptr staticContext() + inline QPatternist::StaticContext::Ptr staticContext() { if(m_staticContext && m_expr) return m_staticContext; |