Merge pull request #43 from rinigus/mbox-update

Update to support current Mapbox GL Native master
rinigus · Jun 8, 2020 · a4d0dd2 · a4d0dd2
2 parents 67c5ae0 + 1ddec38
commit a4d0dd2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/include/qquickitemmapboxgl.h b/include/qquickitemmapboxgl.h
@@ -321,7 +321,7 @@ public slots:
   void onMapChanged(QMapboxGL::MapChange change); ///< Follow the state of the map
   void onMapLoadingFailed(QMapboxGL::MapLoadingFailure type, const QString &description);
 
-  std::string resourceTransform(const std::string &&url); ///< Use resource transform API to change requested URL
+  std::string resourceTransform(const std::string &url); ///< Use resource transform API to change requested URL
 
   void setError(QString error); ///< Set error string, used internally
 

diff --git a/rpm/mapbox-gl-qml.spec b/rpm/mapbox-gl-qml.spec
@@ -18,7 +18,8 @@ BuildRequires: pkgconfig(Qt5Location)
 BuildRequires: pkgconfig(Qt5Positioning)
 BuildRequires: pkgconfig(libcurl)
 BuildRequires: pkgconfig(openssl)
-BuildRequires: qmapboxgl
+BuildRequires: qmapboxgl-devel
+Requires: qmapboxgl
 
 %description
 QML plugin for Mapbox GL Native.

diff --git a/src/qquickitemmapboxgl.cpp b/src/qquickitemmapboxgl.cpp
@@ -1059,7 +1059,7 @@ void QQuickItemMapboxGL::setUrlSuffix(const QString &urlsfx)
   emit urlSuffixChanged(urlsfx);
 }
 
-std::string QQuickItemMapboxGL::resourceTransform(const std::string &&url)
+std::string QQuickItemMapboxGL::resourceTransform(const std::string &url)
 {
   QMutexLocker lk(&m_resourceTransformMutex);
   std::string newurl = url + m_urlSuffix;

diff --git a/src/qsgmapboxglnode.cpp b/src/qsgmapboxglnode.cpp
@@ -114,6 +114,7 @@ bool QSGMapboxGLTextureNode::render(QQuickWindow *window)
 
   // QTBUG-62861
   f->glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
+  f->glDepthRangef(0, 1);
 
   window->resetOpenGLState();
   markDirty(QSGNode::DirtyMaterial);