diff options
Diffstat (limited to 'platform/qt/src/qmapboxgl.cpp')
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index d008ad86c9..e292bbd195 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -45,11 +45,7 @@ #include <mbgl/util/traits.hpp> #include <mbgl/actor/scheduler.hpp> -#if QT_VERSION >= 0x050000 #include <QGuiApplication> -#else -#include <QCoreApplication> -#endif #include <QDebug> #include <QImage> @@ -140,13 +136,8 @@ std::unique_ptr<mbgl::style::Image> toStyleImage(const QString &id, const QImage .rgbSwapped() .convertToFormat(QImage::Format_ARGB32_Premultiplied); -#if QT_VERSION >= 0x051000 - auto img = std::make_unique<uint8_t[]>(swapped.sizeInBytes()); - memcpy(img.get(), swapped.constBits(), swapped.sizeInBytes()); -#else auto img = std::make_unique<uint8_t[]>(swapped.byteCount()); memcpy(img.get(), swapped.constBits(), swapped.byteCount()); -#endif return std::make_unique<mbgl::style::Image>( id.toStdString(), @@ -1839,14 +1830,6 @@ void QMapboxGLPrivate::render() createRenderer(); } -#if defined(__APPLE__) && QT_VERSION < 0x050000 - // FIXME Qt 4.x provides an incomplete FBO at start. - // See https://bugreports.qt.io/browse/QTBUG-36802 for details. - if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { - return; - } -#endif - m_renderQueued.clear(); m_mapRenderer->render(); } |