Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: I0af7b0c3e0a21aae68c82ec11c5ca579c1661ce9

5 files changed, 64 insertions, 8 deletions

diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 1d2f3de1df..6df23cdff5 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -302,6 +302,7 @@ public:
         QV4::ScopedValue vweight(scope, obj->get((s = v4->newString(QStringLiteral("weight")))));
         QV4::ScopedValue vwspac(scope, obj->get((s = v4->newString(QStringLiteral("wordSpacing")))));
         QV4::ScopedValue vhint(scope, obj->get((s = v4->newString(QStringLiteral("hintingPreference")))));
+        QV4::ScopedValue vkerning(scope, obj->get((s = v4->newString(QStringLiteral("kerning")))));
 
         // pull out the values, set ok to true if at least one valid field is given.
         if (vbold->isBoolean()) {
@@ -356,6 +357,10 @@ public:
             retn.setHintingPreference(static_cast<QFont::HintingPreference>(vhint->integerValue()));
             if (ok) *ok = true;
         }
+        if (vkerning->isBoolean()) {
+            retn.setKerning(vkerning->booleanValue());
+            if (ok) *ok = true;
+        }
 
         return retn;
     }
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index e026608150..e218b84fff 100644
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -49,6 +49,7 @@
 #include <qpa/qplatformintegration.h>
 
 #include <QtQuick/private/qsgtexture_p.h>
+#include <QtQuick/private/qsgtexturereader_p.h>
 
 #include <QQuickWindow>
 #include <QCoreApplication>
@@ -771,8 +772,26 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u
             QFile f(localFile);
             QSize readSize;
             if (f.open(QIODevice::ReadOnly)) {
-                if (!readImage(url, &f, &image, &errorStr, &readSize, runningJob->requestSize, runningJob->providerOptions))
-                    errorCode = QQuickPixmapReply::Loading;
+
+                // for now, purely use suffix information to determine whether we are working with a compressed texture
+                QByteArray suffix = QFileInfo(f).suffix().toLower().toLatin1();
+                if (QSGTextureReader::isTexture(&f, suffix)) {
+                    QQuickTextureFactory *factory = QSGTextureReader::read(&f, suffix);
+                    if (factory) {
+                        readSize = factory->textureSize();
+                    } else {
+                        errorStr = QQuickPixmap::tr("Error decoding: %1").arg(url.toString());
+                        errorCode = QQuickPixmapReply::Decoding;
+                    }
+                    mutex.lock();
+                    if (!cancelled.contains(runningJob))
+                        runningJob->postReply(errorCode, errorStr, readSize, factory);
+                    mutex.unlock();
+                    return;
+                } else {
+                    if (!readImage(url, &f, &image, &errorStr, &readSize, runningJob->requestSize, runningJob->providerOptions))
+                        errorCode = QQuickPixmapReply::Loading;
+                }
             } else {
                 errorStr = QQuickPixmap::tr("Cannot open: %1").arg(url.toString());
                 errorCode = QQuickPixmapReply::Loading;
@@ -1233,11 +1252,23 @@ static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, Q
     QString errorString;
 
     if (f.open(QIODevice::ReadOnly)) {
-        QImage image;
-        QQuickImageProviderOptions::AutoTransform appliedTransform = providerOptions.autoTransform();
-        if (readImage(url, &f, &image, &errorString, &readSize, requestSize, providerOptions, &appliedTransform)) {
-            *ok = true;
-            return new QQuickPixmapData(declarativePixmap, url, QQuickTextureFactory::textureFactoryForImage(image), readSize, requestSize, providerOptions, appliedTransform);
+        // for now, purely use suffix information to determine whether we are working with a compressed texture
+        QByteArray suffix = QFileInfo(f).suffix().toLower().toLatin1();
+        if (QSGTextureReader::isTexture(&f, suffix)) {
+            QQuickTextureFactory *factory = QSGTextureReader::read(&f, suffix);
+            if (factory) {
+                *ok = true;
+                return new QQuickPixmapData(declarativePixmap, factory);
+            } else {
+                errorString = QQuickPixmap::tr("Error decoding: %1").arg(url.toString());
+            }
+        } else {
+            QImage image;
+            QQuickImageProviderOptions::AutoTransform appliedTransform = providerOptions.autoTransform();
+            if (readImage(url, &f, &image, &errorString, &readSize, requestSize, providerOptions, &appliedTransform)) {
+                *ok = true;
+                return new QQuickPixmapData(declarativePixmap, url, QQuickTextureFactory::textureFactoryForImage(image), readSize, requestSize, providerOptions, appliedTransform);
+            }
         }
     } else {
         errorString = QQuickPixmap::tr("Cannot open: %1").arg(url.toString());
diff --git a/src/quick/util/qquickvalidator.cpp b/src/quick/util/qquickvalidator.cpp
index 93f414fe80..c3ce149dcf 100644
--- a/src/quick/util/qquickvalidator.cpp
+++ b/src/quick/util/qquickvalidator.cpp
@@ -228,9 +228,15 @@ void QQuickDoubleValidator::resetLocaleName()
 
    \list
    \li A list of numbers with one to three positions separated by a comma:
+       \badcode
        /\d{1,3}(?:,\d{1,3})+$/
+       \endcode
+
    \li An amount consisting of up to 3 numbers before the decimal point, and
-       1 to 2 after the decimal point: \li /(\d{1,3})([.,]\d{1,2})?$/
+       1 to 2 after the decimal point:
+       \badcode
+       /(\d{1,3})([.,]\d{1,2})?$/
+       \endcode
    \endlist
 */
 
diff --git a/src/quick/util/qquickvaluetypes.cpp b/src/quick/util/qquickvaluetypes.cpp
index 4d34c6d661..bc4a72b6ea 100644
--- a/src/quick/util/qquickvaluetypes.cpp
+++ b/src/quick/util/qquickvaluetypes.cpp
@@ -757,6 +757,16 @@ void QQuickFontValueType::setHintingPreference(QQuickFontValueType::HintingPrefe
     v.setHintingPreference(QFont::HintingPreference(hintingPreference));
 }
 
+bool QQuickFontValueType::kerning() const
+{
+    return v.kerning();
+}
+
+void QQuickFontValueType::setKerning(bool b)
+{
+    v.setKerning(b);
+}
+
 QT_END_NAMESPACE
 
 #include "moc_qquickvaluetypes_p.cpp"
diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h
index 4a1598ec5c..a3f35a84ec 100644
--- a/src/quick/util/qquickvaluetypes_p.h
+++ b/src/quick/util/qquickvaluetypes_p.h
@@ -323,6 +323,7 @@ class QQuickFontValueType
     Q_PROPERTY(qreal letterSpacing READ letterSpacing WRITE setLetterSpacing FINAL)
     Q_PROPERTY(qreal wordSpacing READ wordSpacing WRITE setWordSpacing FINAL)
     Q_PROPERTY(HintingPreference hintingPreference READ hintingPreference WRITE setHintingPreference FINAL)
+    Q_PROPERTY(bool kerning READ kerning WRITE setKerning FINAL)
 
 public:
     enum FontWeight { Thin = QFont::Thin,
@@ -393,6 +394,9 @@ public:
 
     HintingPreference hintingPreference() const;
     void setHintingPreference(HintingPreference);
+
+    bool kerning() const;
+    void setKerning(bool b);
 };
 
 QT_END_NAMESPACE