Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: I171c7dbb6a74fe743c2eec63e86e9c0bef7c7dfd

2 files changed, 2 insertions, 10 deletions

diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h
index 00acb51c8a..7a916610e3 100644
--- a/src/quick/scenegraph/coreapi/qsggeometry.h
+++ b/src/quick/scenegraph/coreapi/qsggeometry.h
@@ -88,15 +88,7 @@ public:
         UnsignedShortType = 0x1403,
         IntType = 0x1404,
         UnsignedIntType = 0x1405,
-        FloatType = 0x1406,
-
-        TypeByte = ByteType,
-        TypeUnsignedByte = UnsignedByteType,
-        TypeShort = ShortType,
-        TypeUnsignedShort = UnsignedShortType,
-        TypeInt = IntType,
-        TypeUnsignedInt = UnsignedIntType,
-        TypeFloat = FloatType
+        FloatType = 0x1406
     };
 
     struct Q_QUICK_EXPORT Attribute
diff --git a/src/quick/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp
index e219ddd82e..9923fa6e24 100644
--- a/src/quick/scenegraph/qsgadaptationlayer.cpp
+++ b/src/quick/scenegraph/qsgadaptationlayer.cpp
@@ -122,7 +122,7 @@ void QSGDistanceFieldGlyphCache::populate(const QVector<glyph_t> &glyphs)
     int count = glyphs.count();
     for (int i = 0; i < count; ++i) {
         glyph_t glyphIndex = glyphs.at(i);
-        if ((int) glyphIndex >= glyphCount()) {
+        if ((int) glyphIndex >= glyphCount() && glyphCount() > 0) {
             qWarning("Warning: distance-field glyph is not available with index %d", glyphIndex);
             continue;
         }