Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

25 files changed, 490 insertions, 256 deletions

diff --git a/src/gui/util/qastchandler.cpp b/src/gui/util/qastchandler.cpp
new file mode 100644
index 0000000000..6d163c6701
--- /dev/null
+++ b/src/gui/util/qastchandler.cpp
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qastchandler_p.h"
+#include "qtexturefiledata_p.h"
+
+#include <private/qnumeric_p.h>
+
+#include <QFile>
+#include <QDebug>
+#include <QSize>
+
+QT_BEGIN_NAMESPACE
+
+struct AstcHeader
+{
+    quint8 magic[4];
+    quint8 blockDimX;
+    quint8 blockDimY;
+    quint8 blockDimZ;
+    quint8 xSize[3];
+    quint8 ySize[3];
+    quint8 zSize[3];
+};
+
+bool QAstcHandler::canRead(const QByteArray &suffix, const QByteArray &block)
+{
+    Q_UNUSED(suffix)
+
+    return block.startsWith("\x13\xAB\xA1\x5C");
+}
+
+quint32 QAstcHandler::astcGLFormat(quint8 xBlockDim, quint8 yBlockDim) const
+{
+    static const quint32 glFormatRGBABase = 0x93B0;    // GL_COMPRESSED_RGBA_ASTC_4x4_KHR
+    static const quint32 glFormatSRGBBase = 0x93D0;    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR
+
+    static QSize dims[14] = {
+        {  4, 4  },     // GL_COMPRESSED_xxx_ASTC_4x4_KHR
+        {  5, 4  },     // GL_COMPRESSED_xxx_ASTC_5x4_KHR
+        {  5, 5  },     // GL_COMPRESSED_xxx_ASTC_5x5_KHR
+        {  6, 5  },     // GL_COMPRESSED_xxx_ASTC_6x5_KHR
+        {  6, 6  },     // GL_COMPRESSED_xxx_ASTC_6x6_KHR
+        {  8, 5  },     // GL_COMPRESSED_xxx_ASTC_8x5_KHR
+        {  8, 6  },     // GL_COMPRESSED_xxx_ASTC_8x6_KHR
+        {  8, 8  },     // GL_COMPRESSED_xxx_ASTC_8x8_KHR
+        { 10, 5  },     // GL_COMPRESSED_xxx_ASTC_10x5_KHR
+        { 10, 6  },     // GL_COMPRESSED_xxx_ASTC_10x6_KHR
+        { 10, 8  },     // GL_COMPRESSED_xxx_ASTC_10x8_KHR
+        { 10, 10 },     // GL_COMPRESSED_xxx_ASTC_10x10_KHR
+        { 12, 10 },     // GL_COMPRESSED_xxx_ASTC_12x10_KHR
+        { 12, 12 }      // GL_COMPRESSED_xxx_ASTC_12x12_KHR
+    };
+
+    const QSize dim(xBlockDim, yBlockDim);
+    int index = -1;
+    for (int i = 0; i < 14; i++) {
+        if (dim == dims[i]) {
+            index = i;
+            break;
+        }
+    }
+    if (index < 0)
+        return 0;
+
+    bool useSrgb = qEnvironmentVariableIsSet("QT_ASTCHANDLER_USE_SRGB")
+                   || logName().toLower().contains("srgb");
+
+    return useSrgb ? (glFormatSRGBBase + index) : (glFormatRGBABase + index);
+}
+
+QTextureFileData QAstcHandler::read()
+{
+    QTextureFileData nullData;
+    QTextureFileData res;
+
+    if (!device())
+        return nullData;
+
+    QByteArray fileData = device()->readAll();
+    if (fileData.size() < int(sizeof(AstcHeader)) || !canRead(QByteArray(), fileData)) {
+        qCDebug(lcQtGuiTextureIO, "Not an ASTC file: %s", logName().constData());
+        return nullData;
+    }
+    res.setData(fileData);
+
+    const AstcHeader *header = reinterpret_cast<const AstcHeader *>(fileData.constData());
+
+    int xSz = int(header->xSize[0]) | int(header->xSize[1]) << 8 | int(header->xSize[2]) << 16;
+    int ySz = int(header->ySize[0]) | int(header->ySize[1]) << 8 | int(header->ySize[2]) << 16;
+    int zSz = int(header->zSize[0]) | int(header->zSize[1]) << 8 | int(header->zSize[2]) << 16;
+
+    quint32 glFmt = astcGLFormat(header->blockDimX, header->blockDimY);
+
+    if (!xSz || !ySz || !zSz || !glFmt || header->blockDimZ != 1) {
+        qCDebug(lcQtGuiTextureIO, "Invalid ASTC header data in file %s", logName().constData());
+        return nullData;
+    }
+
+    res.setSize(QSize(xSz, ySz));
+    res.setGLFormat(0);                    // 0 for compressed textures
+    res.setGLInternalFormat(glFmt);
+    //? BaseInternalFormat
+
+    int xBlocks = (xSz + header->blockDimX - 1) / header->blockDimX;
+    int yBlocks = (ySz + header->blockDimY - 1) / header->blockDimY;
+    int zBlocks = (zSz + header->blockDimZ - 1) / header->blockDimZ;
+
+    int byteCount = 0;
+    bool oob = mul_overflow(xBlocks, yBlocks, &byteCount)
+               || mul_overflow(byteCount, zBlocks, &byteCount)
+               || mul_overflow(byteCount, 16, &byteCount);
+
+
+    res.setDataOffset(sizeof(AstcHeader));
+    res.setNumLevels(1);
+    res.setDataLength(byteCount);
+
+    if (oob || !res.isValid()) {
+        qCDebug(lcQtGuiTextureIO, "Invalid ASTC file %s", logName().constData());
+        return nullData;
+    }
+
+    res.setLogName(logName());
+
+#if 0
+    qDebug() << "ASTC file handler read" << res << res.dataOffset() << res.dataLength();
+#endif
+    return res;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/util/qastchandler_p.h b/src/gui/util/qastchandler_p.h
new file mode 100644
index 0000000000..398f1833b6
--- /dev/null
+++ b/src/gui/util/qastchandler_p.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QASTCHANDLER_H
+#define QASTCHANDLER_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qtexturefilehandler_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QAstcHandler : public QTextureFileHandler
+{
+public:
+    using QTextureFileHandler::QTextureFileHandler;
+
+    static bool canRead(const QByteArray &suffix, const QByteArray &block);
+
+    QTextureFileData read() override;
+
+private:
+    quint32 astcGLFormat(quint8 xBlockDim, quint8 yBlockDim) const;
+};
+
+QT_END_NAMESPACE
+
+#endif // QASTCHANDLER_H
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index de9d087c21..8c7cf8682c 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -187,12 +187,7 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
     \l{https://developer.apple.com/documentation/uikit/uiapplication/1622952-canopenurl}{canOpenURL(_:)}.
     For example, the following lines enable URLs with the HTTPS scheme:
 
-    \code
-    <key>LSApplicationQueriesSchemes</key>
-    <array>
-        <string>https</string>
-    </array>
-    \endcode
+    \snippet code/src_gui_util_qdesktopservices.cpp 3
 
     \sa setUrlHandler()
 */
@@ -249,20 +244,12 @@ bool QDesktopServices::openUrl(const QUrl &url)
     The provided method must be implemented as a slot that only accepts a single QUrl
     argument.
 
+    \snippet code/src_gui_util_qdesktopservices.cpp 0
+
     To use this function for receiving data from other apps on iOS you also need to
     add the custom scheme to the \c CFBundleURLSchemes list in your Info.plist file:
 
-    \code
-    <key>CFBundleURLTypes</key>
-    <array>
-        <dict>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>myapp</string>
-            </array>
-        </dict>
-    </array>
-    \endcode
+    \snippet code/src_gui_util_qdesktopservices.cpp 4
 
     For more information, see the Apple Developer Documentation for
     \l{https://developer.apple.com/documentation/uikit/core_app/allowing_apps_and_websites_to_link_to_your_content/communicating_with_other_apps_using_custom_urls?language=objc}{Communicating with Other Apps Using Custom URLs}.
@@ -346,14 +333,9 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme)
     wasn't called, while in Qt 5 it defaults to the name of the executable.
 
     Therefore, if you still need to access the Qt 4 path (for example for data migration to Qt 5), replace
-    \code
-    QDesktopServices::storageLocation(QDesktopServices::DataLocation)
-    \endcode
+    \snippet code/src_gui_util_qdesktopservices.cpp 5
     with
-    \code
-    QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
-    "/data/organization/application"
-    \endcode
+    \snippet code/src_gui_util_qdesktopservices.cpp 6
     (assuming an organization name and an application name were set).
 */
 
diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h
index 5f0cc5da73..5f0e84edb1 100644
--- a/src/gui/util/qgridlayoutengine_p.h
+++ b/src/gui/util/qgridlayoutengine_p.h
@@ -180,7 +180,7 @@ public:
             t = &q_minimumAscent;
             break;
         default:
-            t = 0;
+            t = nullptr;
             break;
         }
         return *t;
@@ -205,7 +205,7 @@ public:
             t = &q_minimumAscent;
             break;
         default:
-            t = 0;
+            t = nullptr;
             break;
         }
         return *t;
@@ -276,7 +276,7 @@ class Q_GUI_EXPORT QGridLayoutItem
 {
 public:
     QGridLayoutItem(int row, int column, int rowSpan = 1, int columnSpan = 1,
-                    Qt::Alignment alignment = 0);
+                    Qt::Alignment alignment = nullptr);
     virtual ~QGridLayoutItem() {}
 
     inline int firstRow() const { return q_firstRows[Ver]; }
@@ -339,7 +339,7 @@ private:
 class Q_GUI_EXPORT QGridLayoutEngine
 {
 public:
-    QGridLayoutEngine(Qt::Alignment defaultAlignment = Qt::Alignment(0), bool snapToPixelGrid = false);
+    QGridLayoutEngine(Qt::Alignment defaultAlignment = Qt::Alignment(nullptr), bool snapToPixelGrid = false);
     inline ~QGridLayoutEngine() { qDeleteAll(q_items); }
 
     int rowCount(Qt::Orientation orientation) const;
diff --git a/src/gui/util/qlayoutpolicy.cpp b/src/gui/util/qlayoutpolicy.cpp
index b2b18c0c8b..507df44a45 100644
--- a/src/gui/util/qlayoutpolicy.cpp
+++ b/src/gui/util/qlayoutpolicy.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Quick Layouts module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/gui/util/qlayoutpolicy_p.h b/src/gui/util/qlayoutpolicy_p.h
index a729a57e8b..6457aeb653 100644
--- a/src/gui/util/qlayoutpolicy_p.h
+++ b/src/gui/util/qlayoutpolicy_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Quick Layouts module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -66,6 +66,7 @@ class QVariant;
 
 class Q_GUI_EXPORT QLayoutPolicy
 {
+    Q_GADGET
     Q_ENUMS(Policy)
 
 public:
diff --git a/src/gui/util/qshaderformat.cpp b/src/gui/util/qshaderformat.cpp
index 373bfb9e7e..324d84ffe1 100644
--- a/src/gui/util/qshaderformat.cpp
+++ b/src/gui/util/qshaderformat.cpp
@@ -41,58 +41,58 @@
 
 QT_BEGIN_NAMESPACE
 
-QShaderFormat::QShaderFormat() Q_DECL_NOTHROW
+QShaderFormat::QShaderFormat() noexcept
     : m_api(NoApi)
 {
 }
 
-QShaderFormat::Api QShaderFormat::api() const Q_DECL_NOTHROW
+QShaderFormat::Api QShaderFormat::api() const noexcept
 {
     return m_api;
 }
 
-void QShaderFormat::setApi(QShaderFormat::Api api) Q_DECL_NOTHROW
+void QShaderFormat::setApi(QShaderFormat::Api api) noexcept
 {
     m_api = api;
 }
 
-QVersionNumber QShaderFormat::version() const Q_DECL_NOTHROW
+QVersionNumber QShaderFormat::version() const noexcept
 {
     return m_version;
 }
 
-void QShaderFormat::setVersion(const QVersionNumber &version) Q_DECL_NOTHROW
+void QShaderFormat::setVersion(const QVersionNumber &version) noexcept
 {
     m_version = version;
 }
 
-QStringList QShaderFormat::extensions() const Q_DECL_NOTHROW
+QStringList QShaderFormat::extensions() const noexcept
 {
     return m_extensions;
 }
 
-void QShaderFormat::setExtensions(const QStringList &extensions) Q_DECL_NOTHROW
+void QShaderFormat::setExtensions(const QStringList &extensions) noexcept
 {
     m_extensions = extensions;
     m_extensions.sort();
 }
 
-QString QShaderFormat::vendor() const Q_DECL_NOTHROW
+QString QShaderFormat::vendor() const noexcept
 {
     return m_vendor;
 }
 
-void QShaderFormat::setVendor(const QString &vendor) Q_DECL_NOTHROW
+void QShaderFormat::setVendor(const QString &vendor) noexcept
 {
     m_vendor = vendor;
 }
 
-bool QShaderFormat::isValid() const Q_DECL_NOTHROW
+bool QShaderFormat::isValid() const noexcept
 {
     return m_api != NoApi && m_version.majorVersion() > 0;
 }
 
-bool QShaderFormat::supports(const QShaderFormat &other) const Q_DECL_NOTHROW
+bool QShaderFormat::supports(const QShaderFormat &other) const noexcept
 {
     if (!isValid() || !other.isValid())
         return false;
@@ -119,7 +119,7 @@ bool QShaderFormat::supports(const QShaderFormat &other) const Q_DECL_NOTHROW
     return true;
 }
 
-bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) noexcept
 {
     return lhs.api() == rhs.api()
         && lhs.version() == rhs.version()
diff --git a/src/gui/util/qshaderformat_p.h b/src/gui/util/qshaderformat_p.h
index 064c2364a7..84bf71fdb6 100644
--- a/src/gui/util/qshaderformat_p.h
+++ b/src/gui/util/qshaderformat_p.h
@@ -69,22 +69,22 @@ public:
         OpenGLES
     };
 
-    Q_GUI_EXPORT QShaderFormat() Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QShaderFormat() noexcept;
 
-    Q_GUI_EXPORT Api api() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setApi(Api api) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT Api api() const noexcept;
+    Q_GUI_EXPORT void setApi(Api api) noexcept;
 
-    Q_GUI_EXPORT QVersionNumber version() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setVersion(const QVersionNumber &version) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QVersionNumber version() const noexcept;
+    Q_GUI_EXPORT void setVersion(const QVersionNumber &version) noexcept;
 
-    Q_GUI_EXPORT QStringList extensions() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setExtensions(const QStringList &extensions) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QStringList extensions() const noexcept;
+    Q_GUI_EXPORT void setExtensions(const QStringList &extensions) noexcept;
 
-    Q_GUI_EXPORT QString vendor() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setVendor(const QString &vendor) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QString vendor() const noexcept;
+    Q_GUI_EXPORT void setVendor(const QString &vendor) noexcept;
 
-    Q_GUI_EXPORT bool isValid() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT bool supports(const QShaderFormat &other) const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT bool isValid() const noexcept;
+    Q_GUI_EXPORT bool supports(const QShaderFormat &other) const noexcept;
 
 private:
     Api m_api;
@@ -93,9 +93,9 @@ private:
     QString m_vendor;
 };
 
-Q_GUI_EXPORT bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) noexcept;
 
-inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/src/gui/util/qshadergenerator.cpp b/src/gui/util/qshadergenerator.cpp
index ae45c03fd1..60cf5a2fc5 100644
--- a/src/gui/util/qshadergenerator.cpp
+++ b/src/gui/util/qshadergenerator.cpp
@@ -260,21 +260,22 @@ namespace
 
     QByteArray replaceParameters(const QByteArray &original, const QShaderNode &node, const QShaderFormat &format)
     {
-        auto result = original;
+        QByteArray result = original;
 
-        for (const auto &parameterName : node.parameterNames()) {
-            const auto placeholder = QByteArray(QByteArrayLiteral("$") + parameterName.toUtf8());
-            const auto parameter = node.parameter(parameterName);
+        const QStringList parameterNames = node.parameterNames();
+        for (const QString &parameterName : parameterNames) {
+            const QByteArray placeholder = QByteArray(QByteArrayLiteral("$") + parameterName.toUtf8());
+            const QVariant parameter = node.parameter(parameterName);
             if (parameter.userType() == qMetaTypeId<QShaderLanguage::StorageQualifier>()) {
-                const auto qualifier = parameter.value<QShaderLanguage::StorageQualifier>();
-                const auto value = toGlsl(qualifier, format);
+                const QShaderLanguage::StorageQualifier qualifier = parameter.value<QShaderLanguage::StorageQualifier>();
+                const QByteArray value = toGlsl(qualifier, format);
                 result.replace(placeholder, value);
             } else if (parameter.userType() == qMetaTypeId<QShaderLanguage::VariableType>()) {
-                const auto type = parameter.value<QShaderLanguage::VariableType>();
-                const auto value = toGlsl(type);
+                const QShaderLanguage::VariableType type = parameter.value<QShaderLanguage::VariableType>();
+                const QByteArray value = toGlsl(type);
                 result.replace(placeholder, value);
             } else {
-                const auto value = parameter.toString().toUtf8();
+                const QByteArray value = parameter.toString().toUtf8();
                 result.replace(placeholder, value);
             }
         }
@@ -288,20 +289,20 @@ QByteArray QShaderGenerator::createShaderCode(const QStringList &enabledLayers)
     auto code = QByteArrayList();
 
     if (format.isValid()) {
-        const auto isGLES = format.api() == QShaderFormat::OpenGLES;
-        const auto major = format.version().majorVersion();
-        const auto minor = format.version().minorVersion();
+        const bool isGLES = format.api() == QShaderFormat::OpenGLES;
+        const int major = format.version().majorVersion();
+        const int minor = format.version().minorVersion();
 
-        const auto version = major == 2 && isGLES ? 100
-                           : major == 3 && isGLES ? 300
-                           : major == 2 ? 100 + 10 * (minor + 1)
-                           : major == 3 && minor <= 2 ? 100 + 10 * (minor + 3)
-                           : major * 100 + minor * 10;
+        const int version = major == 2 && isGLES ? 100
+                          : major == 3 && isGLES ? 300
+                          : major == 2 ? 100 + 10 * (minor + 1)
+                          : major == 3 && minor <= 2 ? 100 + 10 * (minor + 3)
+                          : major * 100 + minor * 10;
 
-        const auto profile = isGLES && version > 100 ? QByteArrayLiteral(" es")
-                           : version >= 150 && format.api() == QShaderFormat::OpenGLCoreProfile ? QByteArrayLiteral(" core")
-                           : version >= 150 && format.api() == QShaderFormat::OpenGLCompatibilityProfile ? QByteArrayLiteral(" compatibility")
-                           : QByteArray();
+        const QByteArray profile = isGLES && version > 100 ? QByteArrayLiteral(" es")
+                                   : version >= 150 && format.api() == QShaderFormat::OpenGLCoreProfile ? QByteArrayLiteral(" core")
+                                   : version >= 150 && format.api() == QShaderFormat::OpenGLCompatibilityProfile ? QByteArrayLiteral(" compatibility")
+                                   : QByteArray();
 
         code << (QByteArrayLiteral("#version ") + QByteArray::number(version) + profile);
         code << QByteArray();
@@ -313,9 +314,11 @@ QByteArray QShaderGenerator::createShaderCode(const QStringList &enabledLayers)
                            [enabledLayers] (const QString &s) { return enabledLayers.contains(s); });
     };
 
-    for (const auto &node : graph.nodes()) {
+    const QVector<QShaderNode> nodes = graph.nodes();
+    for (const QShaderNode &node : nodes) {
         if (intersectsEnabledLayers(node.layers())) {
-            for (const auto &snippet : node.rule(format).headerSnippets) {
+            const QByteArrayList headerSnippets = node.rule(format).headerSnippets;
+            for (const QByteArray &snippet : headerSnippets) {
                 code << replaceParameters(snippet, node, format);
             }
         }
@@ -325,17 +328,18 @@ QByteArray QShaderGenerator::createShaderCode(const QStringList &enabledLayers)
     code << QByteArrayLiteral("void main()");
     code << QByteArrayLiteral("{");
 
-    for (const auto &statement : graph.createStatements(enabledLayers)) {
-        const auto node = statement.node;
-        auto line = node.rule(format).substitution;
-        for (const auto &port : node.ports()) {
-            const auto portName = port.name;
-            const auto portDirection = port.direction;
-            const auto isInput = port.direction == QShaderNodePort::Input;
+    for (const QShaderGraph::Statement &statement : graph.createStatements(enabledLayers)) {
+        const QShaderNode node = statement.node;
+        QByteArray line = node.rule(format).substitution;
+        const QVector<QShaderNodePort> ports = node.ports();
+        for (const QShaderNodePort &port : ports) {
+            const QString portName = port.name;
+            const QShaderNodePort::Direction portDirection = port.direction;
+            const bool isInput = port.direction == QShaderNodePort::Input;
 
-            const auto portIndex = statement.portIndex(portDirection, portName);
-            const auto variableIndex = isInput ? statement.inputs.at(portIndex)
-                                               : statement.outputs.at(portIndex);
+            const int portIndex = statement.portIndex(portDirection, portName);
+            const int variableIndex = isInput ? statement.inputs.at(portIndex)
+                                              : statement.outputs.at(portIndex);
             if (variableIndex < 0)
                 continue;
 
diff --git a/src/gui/util/qshadergraph.cpp b/src/gui/util/qshadergraph.cpp
index 828c709a12..b05b710713 100644
--- a/src/gui/util/qshadergraph.cpp
+++ b/src/gui/util/qshadergraph.cpp
@@ -82,8 +82,8 @@ namespace
         auto statement = QShaderGraph::Statement();
         statement.node = node;
 
-        const auto ports = node.ports();
-        for (const auto &port : ports) {
+        const QVector<QShaderNodePort> ports = node.ports();
+        for (const QShaderNodePort &port : ports) {
             if (port.direction == QShaderNodePort::Input) {
                 statement.inputs.append(-1);
             } else {
@@ -99,35 +99,35 @@ namespace
                                               const QUuid &uuid)
     {
         auto targetStatement = idHash.value(uuid);
-        for (const auto &edge : edges) {
+        for (const QShaderGraph::Edge &edge : edges) {
             if (edge.targetNodeUuid != uuid)
                 continue;
 
-            const auto sourceStatement = idHash.value(edge.sourceNodeUuid);
-            const auto sourcePortIndex = sourceStatement.portIndex(QShaderNodePort::Output, edge.sourcePortName);
-            const auto targetPortIndex = targetStatement.portIndex(QShaderNodePort::Input, edge.targetPortName);
+            const QShaderGraph::Statement sourceStatement = idHash.value(edge.sourceNodeUuid);
+            const int sourcePortIndex = sourceStatement.portIndex(QShaderNodePort::Output, edge.sourcePortName);
+            const int targetPortIndex = targetStatement.portIndex(QShaderNodePort::Input, edge.targetPortName);
 
             if (sourcePortIndex < 0 || targetPortIndex < 0)
                 continue;
 
-            const auto &sourceOutputs = sourceStatement.outputs;
-            auto &targetInputs = targetStatement.inputs;
+            const QVector<int> sourceOutputs = sourceStatement.outputs;
+            QVector<int> &targetInputs = targetStatement.inputs;
             targetInputs[targetPortIndex] = sourceOutputs[sourcePortIndex];
         }
         return targetStatement;
     }
 }
 
-QUuid QShaderGraph::Statement::uuid() const Q_DECL_NOTHROW
+QUuid QShaderGraph::Statement::uuid() const noexcept
 {
     return node.uuid();
 }
 
-int QShaderGraph::Statement::portIndex(QShaderNodePort::Direction direction, const QString &portName) const Q_DECL_NOTHROW
+int QShaderGraph::Statement::portIndex(QShaderNodePort::Direction direction, const QString &portName) const noexcept
 {
-    const auto ports = node.ports();
+    const QVector<QShaderNodePort> ports = node.ports();
     int index = 0;
-    for (const auto &port : ports) {
+    for (const QShaderNodePort &port : ports) {
         if (port.name == portName && port.direction == direction)
             return index;
         else if (port.direction == direction)
@@ -150,7 +150,7 @@ void QShaderGraph::removeNode(const QShaderNode &node)
         m_nodes.erase(it);
 }
 
-QVector<QShaderNode> QShaderGraph::nodes() const Q_DECL_NOTHROW
+QVector<QShaderNode> QShaderGraph::nodes() const noexcept
 {
     return m_nodes;
 }
@@ -167,7 +167,7 @@ void QShaderGraph::removeEdge(const QShaderGraph::Edge &edge)
     m_edges.removeAll(edge);
 }
 
-QVector<QShaderGraph::Edge> QShaderGraph::edges() const Q_DECL_NOTHROW
+QVector<QShaderGraph::Edge> QShaderGraph::edges() const noexcept
 {
     return m_edges;
 }
@@ -180,7 +180,7 @@ QVector<QShaderGraph::Statement> QShaderGraph::createStatements(const QStringLis
                            [enabledLayers] (const QString &s) { return enabledLayers.contains(s); });
     };
 
-    const auto enabledNodes = [this, intersectsEnabledLayers] {
+    const QVector<QShaderNode> enabledNodes = [this, intersectsEnabledLayers] {
         auto res = QVector<QShaderNode>();
         std::copy_if(m_nodes.cbegin(), m_nodes.cend(),
                      std::back_inserter(res),
@@ -190,7 +190,7 @@ QVector<QShaderGraph::Statement> QShaderGraph::createStatements(const QStringLis
         return res;
     }();
 
-    const auto enabledEdges = [this, intersectsEnabledLayers] {
+    const QVector<Edge> enabledEdges = [this, intersectsEnabledLayers] {
         auto res = QVector<Edge>();
         std::copy_if(m_edges.cbegin(), m_edges.cend(),
                      std::back_inserter(res),
@@ -200,18 +200,18 @@ QVector<QShaderGraph::Statement> QShaderGraph::createStatements(const QStringLis
         return res;
     }();
 
-    const auto idHash = [enabledNodes] {
+    const QHash<QUuid, Statement> idHash = [enabledNodes] {
         auto nextVarId = 0;
         auto res = QHash<QUuid, Statement>();
-        for (const auto &node : enabledNodes)
+        for (const QShaderNode &node : enabledNodes)
             res.insert(node.uuid(), nodeToStatement(node, nextVarId));
         return res;
     }();
 
     auto result = QVector<Statement>();
-    auto currentEdges = enabledEdges;
-    auto currentUuids = [enabledNodes] {
-        const auto inputs = copyOutputNodes(enabledNodes);
+    QVector<Edge> currentEdges = enabledEdges;
+    QVector<QUuid> currentUuids = [enabledNodes] {
+        const QVector<QShaderNode> inputs = copyOutputNodes(enabledNodes);
         auto res = QVector<QUuid>();
         std::transform(inputs.cbegin(), inputs.cend(),
                        std::back_inserter(res),
@@ -226,14 +226,14 @@ QVector<QShaderGraph::Statement> QShaderGraph::createStatements(const QStringLis
     // because we want to track the dependencies from the output nodes and not the
     // input nodes
     while (!currentUuids.isEmpty()) {
-        const auto uuid = currentUuids.takeFirst();
+        const QUuid uuid = currentUuids.takeFirst();
         result.append(completeStatement(idHash, enabledEdges, uuid));
 
-        const auto outgoing = outgoingEdges(currentEdges, uuid);
-        for (const auto &outgoingEdge : outgoing) {
+        const QVector<QShaderGraph::Edge> outgoing = outgoingEdges(currentEdges, uuid);
+        for (const QShaderGraph::Edge &outgoingEdge : outgoing) {
             currentEdges.removeAll(outgoingEdge);
             const QUuid nextUuid = outgoingEdge.sourceNodeUuid;
-            const auto incoming = incomingEdges(currentEdges, nextUuid);
+            const QVector<QShaderGraph::Edge> incoming = incomingEdges(currentEdges, nextUuid);
             if (incoming.isEmpty()) {
                 currentUuids.append(nextUuid);
             }
@@ -244,7 +244,7 @@ QVector<QShaderGraph::Statement> QShaderGraph::createStatements(const QStringLis
     return result;
 }
 
-bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) noexcept
 {
     return lhs.sourceNodeUuid == rhs.sourceNodeUuid
         && lhs.sourcePortName == rhs.sourcePortName
@@ -252,7 +252,7 @@ bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) Q_
         && lhs.targetPortName == rhs.targetPortName;
 }
 
-bool operator==(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) noexcept
 {
     return lhs.inputs == rhs.inputs
         && lhs.outputs == rhs.outputs
diff --git a/src/gui/util/qshadergraph_p.h b/src/gui/util/qshadergraph_p.h
index 756e1b2da2..9367a3783c 100644
--- a/src/gui/util/qshadergraph_p.h
+++ b/src/gui/util/qshadergraph_p.h
@@ -73,8 +73,8 @@ public:
     class Statement
     {
     public:
-        Q_GUI_EXPORT QUuid uuid() const Q_DECL_NOTHROW;
-        Q_GUI_EXPORT int portIndex(QShaderNodePort::Direction direction, const QString &portName) const Q_DECL_NOTHROW;
+        Q_GUI_EXPORT QUuid uuid() const noexcept;
+        Q_GUI_EXPORT int portIndex(QShaderNodePort::Direction direction, const QString &portName) const noexcept;
 
         QShaderNode node;
         QVector<int> inputs;
@@ -83,11 +83,11 @@ public:
 
     Q_GUI_EXPORT void addNode(const QShaderNode &node);
     Q_GUI_EXPORT void removeNode(const QShaderNode &node);
-    Q_GUI_EXPORT QVector<QShaderNode> nodes() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QVector<QShaderNode> nodes() const noexcept;
 
     Q_GUI_EXPORT void addEdge(const Edge &edge);
     Q_GUI_EXPORT void removeEdge(const Edge &edge);
-    Q_GUI_EXPORT QVector<Edge> edges() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QVector<Edge> edges() const noexcept;
 
     Q_GUI_EXPORT QVector<Statement> createStatements(const QStringList &enabledLayers = QStringList()) const;
 
@@ -96,16 +96,16 @@ private:
     QVector<Edge> m_edges;
 };
 
-Q_GUI_EXPORT bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) noexcept;
 
-inline bool operator!=(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) noexcept
 {
     return !(lhs == rhs);
 }
 
-Q_GUI_EXPORT bool operator==(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) noexcept;
 
-inline bool operator!=(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderGraph::Statement &lhs, const QShaderGraph::Statement &rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/src/gui/util/qshadergraphloader.cpp b/src/gui/util/qshadergraphloader.cpp
index 99a9f7869e..a393e876e0 100644
--- a/src/gui/util/qshadergraphloader.cpp
+++ b/src/gui/util/qshadergraphloader.cpp
@@ -52,29 +52,29 @@ QT_BEGIN_NAMESPACE
 
 void qt_register_ShaderLanguage_enums();
 
-QShaderGraphLoader::QShaderGraphLoader() Q_DECL_NOTHROW
+QShaderGraphLoader::QShaderGraphLoader() noexcept
     : m_status(Null),
       m_device(nullptr)
 {
     qt_register_ShaderLanguage_enums();
 }
 
-QShaderGraphLoader::Status QShaderGraphLoader::status() const Q_DECL_NOTHROW
+QShaderGraphLoader::Status QShaderGraphLoader::status() const noexcept
 {
     return m_status;
 }
 
-QShaderGraph QShaderGraphLoader::graph() const Q_DECL_NOTHROW
+QShaderGraph QShaderGraphLoader::graph() const noexcept
 {
     return m_graph;
 }
 
-QIODevice *QShaderGraphLoader::device() const Q_DECL_NOTHROW
+QIODevice *QShaderGraphLoader::device() const noexcept
 {
     return m_device;
 }
 
-void QShaderGraphLoader::setDevice(QIODevice *device) Q_DECL_NOTHROW
+void QShaderGraphLoader::setDevice(QIODevice *device) noexcept
 {
     m_device = device;
     m_graph = QShaderGraph();
@@ -83,12 +83,12 @@ void QShaderGraphLoader::setDevice(QIODevice *device) Q_DECL_NOTHROW
              : Error;
 }
 
-QHash<QString, QShaderNode> QShaderGraphLoader::prototypes() const Q_DECL_NOTHROW
+QHash<QString, QShaderNode> QShaderGraphLoader::prototypes() const noexcept
 {
     return m_prototypes;
 }
 
-void QShaderGraphLoader::setPrototypes(const QHash<QString, QShaderNode> &prototypes) Q_DECL_NOTHROW
+void QShaderGraphLoader::setPrototypes(const QHash<QString, QShaderNode> &prototypes) noexcept
 {
     m_prototypes = prototypes;
 }
@@ -99,7 +99,7 @@ void QShaderGraphLoader::load()
         return;
 
     auto error = QJsonParseError();
-    const auto document = QJsonDocument::fromJson(m_device->readAll(), &error);
+    const QJsonDocument document = QJsonDocument::fromJson(m_device->readAll(), &error);
 
     if (error.error != QJsonParseError::NoError) {
         qWarning() << "Invalid JSON document:" << error.errorString();
@@ -113,16 +113,16 @@ void QShaderGraphLoader::load()
         return;
     }
 
-    const auto root = document.object();
+    const QJsonObject root = document.object();
 
-    const auto nodesValue = root.value(QStringLiteral("nodes"));
+    const QJsonValue nodesValue = root.value(QStringLiteral("nodes"));
     if (!nodesValue.isArray()) {
         qWarning() << "Invalid nodes property, should be an array";
         m_status = Error;
         return;
     }
 
-    const auto edgesValue = root.value(QStringLiteral("edges"));
+    const QJsonValue edgesValue = root.value(QStringLiteral("edges"));
     if (!edgesValue.isArray()) {
         qWarning() << "Invalid edges property, should be an array";
         m_status = Error;
@@ -131,7 +131,7 @@ void QShaderGraphLoader::load()
 
     bool hasError = false;
 
-    const auto prototypesValue = root.value(QStringLiteral("prototypes"));
+    const QJsonValue prototypesValue = root.value(QStringLiteral("prototypes"));
     if (!prototypesValue.isUndefined()) {
         if (prototypesValue.isObject()) {
             QShaderNodesLoader loader;
@@ -144,60 +144,60 @@ void QShaderGraphLoader::load()
         }
     }
 
-    const auto nodes = nodesValue.toArray();
-    for (const auto &nodeValue : nodes) {
+    const QJsonArray nodes = nodesValue.toArray();
+    for (const QJsonValue &nodeValue : nodes) {
         if (!nodeValue.isObject()) {
             qWarning() << "Invalid node found";
             hasError = true;
             continue;
         }
 
-        const auto nodeObject = nodeValue.toObject();
+        const QJsonObject nodeObject = nodeValue.toObject();
 
-        const auto uuidString = nodeObject.value(QStringLiteral("uuid")).toString();
-        const auto uuid = QUuid(uuidString);
+        const QString uuidString = nodeObject.value(QStringLiteral("uuid")).toString();
+        const QUuid uuid = QUuid(uuidString);
         if (uuid.isNull()) {
             qWarning() << "Invalid UUID found in node:" << uuidString;
             hasError = true;
             continue;
         }
 
-        const auto type = nodeObject.value(QStringLiteral("type")).toString();
+        const QString type = nodeObject.value(QStringLiteral("type")).toString();
         if (!m_prototypes.contains(type)) {
             qWarning() << "Unsupported node type found:" << type;
             hasError = true;
             continue;
         }
 
-        const auto layersArray = nodeObject.value(QStringLiteral("layers")).toArray();
+        const QJsonArray layersArray = nodeObject.value(QStringLiteral("layers")).toArray();
         auto layers = QStringList();
-        for (const auto &layerValue : layersArray) {
+        for (const QJsonValue &layerValue : layersArray) {
             layers.append(layerValue.toString());
         }
 
-        auto node = m_prototypes.value(type);
+        QShaderNode node = m_prototypes.value(type);
         node.setUuid(uuid);
         node.setLayers(layers);
 
-        const auto parametersValue = nodeObject.value(QStringLiteral("parameters"));
+        const QJsonValue parametersValue = nodeObject.value(QStringLiteral("parameters"));
         if (parametersValue.isObject()) {
-            const auto parametersObject = parametersValue.toObject();
-            for (const auto &parameterName : parametersObject.keys()) {
-                const auto parameterValue = parametersObject.value(parameterName);
+            const QJsonObject parametersObject = parametersValue.toObject();
+            for (const QString &parameterName : parametersObject.keys()) {
+                const QJsonValue parameterValue = parametersObject.value(parameterName);
                 if (parameterValue.isObject()) {
-                    const auto parameterObject = parameterValue.toObject();
-                    const auto type = parameterObject.value(QStringLiteral("type")).toString();
-                    const auto typeId = QMetaType::type(type.toUtf8());
+                    const QJsonObject parameterObject = parameterValue.toObject();
+                    const QString type = parameterObject.value(QStringLiteral("type")).toString();
+                    const int typeId = QMetaType::type(type.toUtf8());
 
-                    const auto value = parameterObject.value(QStringLiteral("value")).toString();
+                    const QString value = parameterObject.value(QStringLiteral("value")).toString();
                     auto variant = QVariant(value);
 
                     if (QMetaType::typeFlags(typeId) & QMetaType::IsEnumeration) {
-                        const auto metaObject = QMetaType::metaObjectForType(typeId);
-                        const auto className = metaObject->className();
-                        const auto enumName = type.mid(static_cast<int>(qstrlen(className)) + 2).toUtf8();
-                        const auto metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName));
-                        const auto enumValue = metaEnum.keyToValue(value.toUtf8());
+                        const QMetaObject *metaObject = QMetaType::metaObjectForType(typeId);
+                        const char *className = metaObject->className();
+                        const QByteArray enumName = type.mid(static_cast<int>(qstrlen(className)) + 2).toUtf8();
+                        const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName));
+                        const int enumValue = metaEnum.keyToValue(value.toUtf8());
                         variant = QVariant(enumValue);
                         variant.convert(typeId);
                     } else {
@@ -213,39 +213,39 @@ void QShaderGraphLoader::load()
         m_graph.addNode(node);
     }
 
-    const auto edges = edgesValue.toArray();
-    for (const auto &edgeValue : edges) {
+    const QJsonArray edges = edgesValue.toArray();
+    for (const QJsonValue &edgeValue : edges) {
         if (!edgeValue.isObject()) {
             qWarning() << "Invalid edge found";
             hasError = true;
             continue;
         }
 
-        const auto edgeObject = edgeValue.toObject();
+        const QJsonObject edgeObject = edgeValue.toObject();
 
-        const auto sourceUuidString = edgeObject.value(QStringLiteral("sourceUuid")).toString();
-        const auto sourceUuid = QUuid(sourceUuidString);
+        const QString sourceUuidString = edgeObject.value(QStringLiteral("sourceUuid")).toString();
+        const QUuid sourceUuid = QUuid(sourceUuidString);
         if (sourceUuid.isNull()) {
             qWarning() << "Invalid source UUID found in edge:" << sourceUuidString;
             hasError = true;
             continue;
         }
 
-        const auto sourcePort = edgeObject.value(QStringLiteral("sourcePort")).toString();
+        const QString sourcePort = edgeObject.value(QStringLiteral("sourcePort")).toString();
 
-        const auto targetUuidString = edgeObject.value(QStringLiteral("targetUuid")).toString();
-        const auto targetUuid = QUuid(targetUuidString);
+        const QString targetUuidString = edgeObject.value(QStringLiteral("targetUuid")).toString();
+        const QUuid targetUuid = QUuid(targetUuidString);
         if (targetUuid.isNull()) {
             qWarning() << "Invalid target UUID found in edge:" << targetUuidString;
             hasError = true;
             continue;
         }
 
-        const auto targetPort = edgeObject.value(QStringLiteral("targetPort")).toString();
+        const QString targetPort = edgeObject.value(QStringLiteral("targetPort")).toString();
 
-        const auto layersArray = edgeObject.value(QStringLiteral("layers")).toArray();
+        const QJsonArray layersArray = edgeObject.value(QStringLiteral("layers")).toArray();
         auto layers = QStringList();
-        for (const auto &layerValue : layersArray) {
+        for (const QJsonValue &layerValue : layersArray) {
             layers.append(layerValue.toString());
         }
 
diff --git a/src/gui/util/qshadergraphloader_p.h b/src/gui/util/qshadergraphloader_p.h
index 97cbd8d18c..e7aa19fa2d 100644
--- a/src/gui/util/qshadergraphloader_p.h
+++ b/src/gui/util/qshadergraphloader_p.h
@@ -69,16 +69,16 @@ public:
         Error
     };
 
-    Q_GUI_EXPORT QShaderGraphLoader() Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QShaderGraphLoader() noexcept;
 
-    Q_GUI_EXPORT Status status() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT QShaderGraph graph() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT Status status() const noexcept;
+    Q_GUI_EXPORT QShaderGraph graph() const noexcept;
 
-    Q_GUI_EXPORT QIODevice *device() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setDevice(QIODevice *device) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QIODevice *device() const noexcept;
+    Q_GUI_EXPORT void setDevice(QIODevice *device) noexcept;
 
-    Q_GUI_EXPORT QHash<QString, QShaderNode> prototypes() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setPrototypes(const QHash<QString, QShaderNode> &prototypes) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QHash<QString, QShaderNode> prototypes() const noexcept;
+    Q_GUI_EXPORT void setPrototypes(const QHash<QString, QShaderNode> &prototypes) noexcept;
 
     Q_GUI_EXPORT void load();
 
diff --git a/src/gui/util/qshaderlanguage.cpp b/src/gui/util/qshaderlanguage.cpp
index f9192f5ff3..efd607ba60 100644
--- a/src/gui/util/qshaderlanguage.cpp
+++ b/src/gui/util/qshaderlanguage.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Quick Layouts module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/gui/util/qshaderlanguage_p.h b/src/gui/util/qshaderlanguage_p.h
index e31dcd3a9b..441f7a58d5 100644
--- a/src/gui/util/qshaderlanguage_p.h
+++ b/src/gui/util/qshaderlanguage_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Quick Layouts module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/gui/util/qshadernode.cpp b/src/gui/util/qshadernode.cpp
index 676667ddcf..547e5c51a8 100644
--- a/src/gui/util/qshadernode.cpp
+++ b/src/gui/util/qshadernode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Quick Layouts module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QShaderNode::Type QShaderNode::type() const Q_DECL_NOTHROW
+QShaderNode::Type QShaderNode::type() const noexcept
 {
     int inputCount = 0;
     int outputCount = 0;
@@ -62,27 +62,27 @@ QShaderNode::Type QShaderNode::type() const Q_DECL_NOTHROW
          : Function;
 }
 
-QUuid QShaderNode::uuid() const Q_DECL_NOTHROW
+QUuid QShaderNode::uuid() const noexcept
 {
     return m_uuid;
 }
 
-void QShaderNode::setUuid(const QUuid &uuid) Q_DECL_NOTHROW
+void QShaderNode::setUuid(const QUuid &uuid) noexcept
 {
     m_uuid = uuid;
 }
 
-QStringList QShaderNode::layers() const Q_DECL_NOTHROW
+QStringList QShaderNode::layers() const noexcept
 {
     return m_layers;
 }
 
-void QShaderNode::setLayers(const QStringList &layers) Q_DECL_NOTHROW
+void QShaderNode::setLayers(const QStringList &layers) noexcept
 {
     m_layers = layers;
 }
 
-QVector<QShaderNodePort> QShaderNode::ports() const Q_DECL_NOTHROW
+QVector<QShaderNodePort> QShaderNode::ports() const noexcept
 {
     return m_ports;
 }
@@ -157,13 +157,13 @@ QShaderNode::Rule QShaderNode::rule(const QShaderFormat &format) const
     return it != m_rules.crend() ? it->second : Rule();
 }
 
-QShaderNode::Rule::Rule(const QByteArray &subs, const QByteArrayList &snippets) Q_DECL_NOTHROW
+QShaderNode::Rule::Rule(const QByteArray &subs, const QByteArrayList &snippets) noexcept
     : substitution(subs),
       headerSnippets(snippets)
 {
 }
 
-bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) noexcept
 {
     return lhs.substitution == rhs.substitution
         && lhs.headerSnippets == rhs.headerSnippets;
diff --git a/src/gui/util/qshadernode_p.h b/src/gui/util/qshadernode_p.h
index 494c87bc18..c3d149d8a5 100644
--- a/src/gui/util/qshadernode_p.h
+++ b/src/gui/util/qshadernode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Quick Layouts module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -73,21 +73,21 @@ public:
     class Rule
     {
     public:
-        Q_GUI_EXPORT Rule(const QByteArray &substitution = QByteArray(), const QByteArrayList &headerSnippets = QByteArrayList()) Q_DECL_NOTHROW;
+        Q_GUI_EXPORT Rule(const QByteArray &substitution = QByteArray(), const QByteArrayList &headerSnippets = QByteArrayList()) noexcept;
 
         QByteArray substitution;
         QByteArrayList headerSnippets;
     };
 
-    Q_GUI_EXPORT Type type() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT Type type() const noexcept;
 
-    Q_GUI_EXPORT QUuid uuid() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setUuid(const QUuid &uuid) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QUuid uuid() const noexcept;
+    Q_GUI_EXPORT void setUuid(const QUuid &uuid) noexcept;
 
-    Q_GUI_EXPORT QStringList layers() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setLayers(const QStringList &layers) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QStringList layers() const noexcept;
+    Q_GUI_EXPORT void setLayers(const QStringList &layers) noexcept;
 
-    Q_GUI_EXPORT QVector<QShaderNodePort> ports() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QVector<QShaderNodePort> ports() const noexcept;
     Q_GUI_EXPORT void addPort(const QShaderNodePort &port);
     Q_GUI_EXPORT void removePort(const QShaderNodePort &port);
 
@@ -110,9 +110,9 @@ private:
     QVector<QPair<QShaderFormat, QShaderNode::Rule>> m_rules;
 };
 
-Q_GUI_EXPORT bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) noexcept;
 
-inline bool operator!=(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/src/gui/util/qshadernodeport.cpp b/src/gui/util/qshadernodeport.cpp
index 03646a9467..15dbc4160e 100644
--- a/src/gui/util/qshadernodeport.cpp
+++ b/src/gui/util/qshadernodeport.cpp
@@ -41,12 +41,12 @@
 
 QT_BEGIN_NAMESPACE
 
-QShaderNodePort::QShaderNodePort() Q_DECL_NOTHROW
+QShaderNodePort::QShaderNodePort() noexcept
     : direction(Output)
 {
 }
 
-bool operator==(const QShaderNodePort &lhs, const QShaderNodePort &rhs) Q_DECL_NOTHROW
+bool operator==(const QShaderNodePort &lhs, const QShaderNodePort &rhs) noexcept
 {
     return lhs.direction == rhs.direction
         && lhs.name == rhs.name;
diff --git a/src/gui/util/qshadernodeport_p.h b/src/gui/util/qshadernodeport_p.h
index cfdaf05017..c69ba23a3f 100644
--- a/src/gui/util/qshadernodeport_p.h
+++ b/src/gui/util/qshadernodeport_p.h
@@ -66,15 +66,15 @@ public:
         Output
     };
 
-    Q_GUI_EXPORT QShaderNodePort() Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QShaderNodePort() noexcept;
 
     QShaderNodePort::Direction direction;
     QString name;
 };
 
-Q_GUI_EXPORT bool operator==(const QShaderNodePort &lhs, const QShaderNodePort &rhs) Q_DECL_NOTHROW;
+Q_GUI_EXPORT bool operator==(const QShaderNodePort &lhs, const QShaderNodePort &rhs) noexcept;
 
-inline bool operator!=(const QShaderNodePort &lhs, const QShaderNodePort &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QShaderNodePort &lhs, const QShaderNodePort &rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/src/gui/util/qshadernodesloader.cpp b/src/gui/util/qshadernodesloader.cpp
index 692653ee44..af565c906d 100644
--- a/src/gui/util/qshadernodesloader.cpp
+++ b/src/gui/util/qshadernodesloader.cpp
@@ -48,28 +48,28 @@
 
 QT_BEGIN_NAMESPACE
 
-QShaderNodesLoader::QShaderNodesLoader() Q_DECL_NOTHROW
+QShaderNodesLoader::QShaderNodesLoader() noexcept
     : m_status(Null),
       m_device(nullptr)
 {
 }
 
-QShaderNodesLoader::Status QShaderNodesLoader::status() const Q_DECL_NOTHROW
+QShaderNodesLoader::Status QShaderNodesLoader::status() const noexcept
 {
     return m_status;
 }
 
-QHash<QString, QShaderNode> QShaderNodesLoader::nodes() const Q_DECL_NOTHROW
+QHash<QString, QShaderNode> QShaderNodesLoader::nodes() const noexcept
 {
     return m_nodes;
 }
 
-QIODevice *QShaderNodesLoader::device() const Q_DECL_NOTHROW
+QIODevice *QShaderNodesLoader::device() const noexcept
 {
     return m_device;
 }
 
-void QShaderNodesLoader::setDevice(QIODevice *device) Q_DECL_NOTHROW
+void QShaderNodesLoader::setDevice(QIODevice *device) noexcept
 {
     m_device = device;
     m_nodes.clear();
@@ -84,7 +84,7 @@ void QShaderNodesLoader::load()
         return;
 
     auto error = QJsonParseError();
-    const auto document = QJsonDocument::fromJson(m_device->readAll(), &error);
+    const QJsonDocument document = QJsonDocument::fromJson(m_device->readAll(), &error);
 
     if (error.error != QJsonParseError::NoError) {
         qWarning() << "Invalid JSON document:" << error.errorString();
@@ -98,7 +98,7 @@ void QShaderNodesLoader::load()
         return;
     }
 
-    const auto root = document.object();
+    const QJsonObject root = document.object();
     load(root);
 }
 
@@ -106,22 +106,22 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
 {
     bool hasError = false;
 
-    for (const auto &property : prototypesObject.keys()) {
-        const auto nodeValue = prototypesObject.value(property);
+    for (const QString &property : prototypesObject.keys()) {
+        const QJsonValue nodeValue = prototypesObject.value(property);
         if (!nodeValue.isObject()) {
             qWarning() << "Invalid node found";
             hasError = true;
             break;
         }
 
-        const auto nodeObject = nodeValue.toObject();
+        const QJsonObject nodeObject = nodeValue.toObject();
 
         auto node = QShaderNode();
 
-        const auto inputsValue = nodeObject.value(QStringLiteral("inputs"));
+        const QJsonValue inputsValue = nodeObject.value(QStringLiteral("inputs"));
         if (inputsValue.isArray()) {
-            const auto inputsArray = inputsValue.toArray();
-            for (const auto &inputValue : inputsArray) {
+            const QJsonArray inputsArray = inputsValue.toArray();
+            for (const QJsonValue &inputValue : inputsArray) {
                 if (!inputValue.isString()) {
                     qWarning() << "Non-string value in inputs";
                     hasError = true;
@@ -135,10 +135,10 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
             }
         }
 
-        const auto outputsValue = nodeObject.value(QStringLiteral("outputs"));
+        const QJsonValue outputsValue = nodeObject.value(QStringLiteral("outputs"));
         if (outputsValue.isArray()) {
-            const auto outputsArray = outputsValue.toArray();
-            for (const auto &outputValue : outputsArray) {
+            const QJsonArray outputsArray = outputsValue.toArray();
+            for (const QJsonValue &outputValue : outputsArray) {
                 if (!outputValue.isString()) {
                     qWarning() << "Non-string value in outputs";
                     hasError = true;
@@ -152,25 +152,25 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
             }
         }
 
-        const auto parametersValue = nodeObject.value(QStringLiteral("parameters"));
+        const QJsonValue parametersValue = nodeObject.value(QStringLiteral("parameters"));
         if (parametersValue.isObject()) {
-            const auto parametersObject = parametersValue.toObject();
-            for (const auto &parameterName : parametersObject.keys()) {
-                const auto parameterValue = parametersObject.value(parameterName);
+            const QJsonObject parametersObject = parametersValue.toObject();
+            for (const QString &parameterName : parametersObject.keys()) {
+                const QJsonValue parameterValue = parametersObject.value(parameterName);
                 if (parameterValue.isObject()) {
-                    const auto parameterObject = parameterValue.toObject();
-                    const auto type = parameterObject.value(QStringLiteral("type")).toString();
-                    const auto typeId = QMetaType::type(type.toUtf8());
+                    const QJsonObject parameterObject = parameterValue.toObject();
+                    const QString type = parameterObject.value(QStringLiteral("type")).toString();
+                    const int typeId = QMetaType::type(type.toUtf8());
 
-                    const auto value = parameterObject.value(QStringLiteral("value")).toString();
+                    const QString value = parameterObject.value(QStringLiteral("value")).toString();
                     auto variant = QVariant(value);
 
                     if (QMetaType::typeFlags(typeId) & QMetaType::IsEnumeration) {
-                        const auto metaObject = QMetaType::metaObjectForType(typeId);
-                        const auto className = metaObject->className();
-                        const auto enumName = type.mid(static_cast<int>(qstrlen(className)) + 2).toUtf8();
-                        const auto metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName));
-                        const auto enumValue = metaEnum.keyToValue(value.toUtf8());
+                        const QMetaObject *metaObject = QMetaType::metaObjectForType(typeId);
+                        const char *className = metaObject->className();
+                        const QByteArray enumName = type.mid(static_cast<int>(qstrlen(className)) + 2).toUtf8();
+                        const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName));
+                        const int enumValue = metaEnum.keyToValue(value.toUtf8());
                         variant = QVariant(enumValue);
                         variant.convert(typeId);
                     } else {
@@ -183,36 +183,36 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
             }
         }
 
-        const auto rulesValue = nodeObject.value(QStringLiteral("rules"));
+        const QJsonValue rulesValue = nodeObject.value(QStringLiteral("rules"));
         if (rulesValue.isArray()) {
-            const auto rulesArray = rulesValue.toArray();
-            for (const auto &ruleValue : rulesArray) {
+            const QJsonArray rulesArray = rulesValue.toArray();
+            for (const QJsonValue &ruleValue : rulesArray) {
                 if (!ruleValue.isObject()) {
                     qWarning() << "Rules should be objects";
                     hasError = true;
                     break;
                 }
 
-                const auto ruleObject = ruleValue.toObject();
+                const QJsonObject ruleObject = ruleValue.toObject();
 
-                const auto formatValue = ruleObject.value(QStringLiteral("format"));
+                const QJsonValue formatValue = ruleObject.value(QStringLiteral("format"));
                 if (!formatValue.isObject()) {
                     qWarning() << "Format is mandatory in rules and should be an object";
                     hasError = true;
                     break;
                 }
 
-                const auto formatObject = formatValue.toObject();
+                const QJsonObject formatObject = formatValue.toObject();
                 auto format = QShaderFormat();
 
-                const auto apiValue = formatObject.value(QStringLiteral("api"));
+                const QJsonValue apiValue = formatObject.value(QStringLiteral("api"));
                 if (!apiValue.isString()) {
                     qWarning() << "Format API must be a string";
                     hasError = true;
                     break;
                 }
 
-                const auto api = apiValue.toString();
+                const QString api = apiValue.toString();
                 format.setApi(api == QStringLiteral("OpenGLES") ? QShaderFormat::OpenGLES
                             : api == QStringLiteral("OpenGLNoProfile") ? QShaderFormat::OpenGLNoProfile
                             : api == QStringLiteral("OpenGLCoreProfile") ? QShaderFormat::OpenGLCoreProfile
@@ -224,8 +224,8 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
                     break;
                 }
 
-                const auto majorValue = formatObject.value(QStringLiteral("major"));
-                const auto minorValue = formatObject.value(QStringLiteral("minor"));
+                const QJsonValue majorValue = formatObject.value(QStringLiteral("major"));
+                const QJsonValue minorValue = formatObject.value(QStringLiteral("minor"));
                 if (!majorValue.isDouble() || !minorValue.isDouble()) {
                     qWarning() << "Format major and minor version must be values";
                     hasError = true;
@@ -233,28 +233,28 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
                 }
                 format.setVersion(QVersionNumber(majorValue.toInt(), minorValue.toInt()));
 
-                const auto extensionsValue = formatObject.value(QStringLiteral("extensions"));
-                const auto extensionsArray = extensionsValue.toArray();
+                const QJsonValue extensionsValue = formatObject.value(QStringLiteral("extensions"));
+                const QJsonArray extensionsArray = extensionsValue.toArray();
                 auto extensions = QStringList();
                 std::transform(extensionsArray.constBegin(), extensionsArray.constEnd(),
                                std::back_inserter(extensions),
                                [] (const QJsonValue &extensionValue) { return extensionValue.toString(); });
                 format.setExtensions(extensions);
 
-                const auto vendor = formatObject.value(QStringLiteral("vendor")).toString();
+                const QString vendor = formatObject.value(QStringLiteral("vendor")).toString();
                 format.setVendor(vendor);
 
-                const auto substitutionValue = ruleObject.value(QStringLiteral("substitution"));
+                const QJsonValue substitutionValue = ruleObject.value(QStringLiteral("substitution"));
                 if (!substitutionValue.isString()) {
                     qWarning() << "Substitution needs to be a string";
                     hasError = true;
                     break;
                 }
 
-                const auto substitution = substitutionValue.toString().toUtf8();
+                const QByteArray substitution = substitutionValue.toString().toUtf8();
 
-                const auto snippetsValue = ruleObject.value(QStringLiteral("headerSnippets"));
-                const auto snippetsArray = snippetsValue.toArray();
+                const QJsonValue snippetsValue = ruleObject.value(QStringLiteral("headerSnippets"));
+                const QJsonArray snippetsArray = snippetsValue.toArray();
                 auto snippets = QByteArrayList();
                 std::transform(snippetsArray.constBegin(), snippetsArray.constEnd(),
                                std::back_inserter(snippets),
diff --git a/src/gui/util/qshadernodesloader_p.h b/src/gui/util/qshadernodesloader_p.h
index 0bec871857..432d7d4494 100644
--- a/src/gui/util/qshadernodesloader_p.h
+++ b/src/gui/util/qshadernodesloader_p.h
@@ -69,13 +69,13 @@ public:
         Error
     };
 
-    Q_GUI_EXPORT QShaderNodesLoader() Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QShaderNodesLoader() noexcept;
 
-    Q_GUI_EXPORT Status status() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT QHash<QString, QShaderNode> nodes() const Q_DECL_NOTHROW;
+    Q_GUI_EXPORT Status status() const noexcept;
+    Q_GUI_EXPORT QHash<QString, QShaderNode> nodes() const noexcept;
 
-    Q_GUI_EXPORT QIODevice *device() const Q_DECL_NOTHROW;
-    Q_GUI_EXPORT void setDevice(QIODevice *device) Q_DECL_NOTHROW;
+    Q_GUI_EXPORT QIODevice *device() const noexcept;
+    Q_GUI_EXPORT void setDevice(QIODevice *device) noexcept;
 
     Q_GUI_EXPORT void load();
     Q_GUI_EXPORT void load(const QJsonObject &prototypesObject);
diff --git a/src/gui/util/qtexturefilehandler_p.h b/src/gui/util/qtexturefilehandler_p.h
index b808d3e7db..3d4f42526f 100644
--- a/src/gui/util/qtexturefilehandler_p.h
+++ b/src/gui/util/qtexturefilehandler_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtQuick module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/gui/util/qtexturefilereader.cpp b/src/gui/util/qtexturefilereader.cpp
index 5d4bd600e0..fefb957323 100644
--- a/src/gui/util/qtexturefilereader.cpp
+++ b/src/gui/util/qtexturefilereader.cpp
@@ -41,6 +41,7 @@
 
 #include "qpkmhandler_p.h"
 #include "qktxhandler_p.h"
+#include "qastchandler_p.h"
 
 #include <QFileInfo>
 
@@ -80,6 +81,8 @@ bool QTextureFileReader::canRead()
             m_handler = new QPkmHandler(m_device, logName);
         } else if (QKtxHandler::canRead(suffix, headerBlock)) {
             m_handler = new QKtxHandler(m_device, logName);
+        } else if (QAstcHandler::canRead(suffix, headerBlock)) {
+            m_handler = new QAstcHandler(m_device, logName);
         }
         // else if OtherHandler::canRead() ...etc.
     }
@@ -89,7 +92,7 @@ bool QTextureFileReader::canRead()
 QList<QByteArray> QTextureFileReader::supportedFileFormats()
 {
     // Hardcoded for now
-    return {QByteArrayLiteral("pkm"), QByteArrayLiteral("ktx")};
+    return {QByteArrayLiteral("pkm"), QByteArrayLiteral("ktx"), QByteArrayLiteral("astc")};
 }
 
 bool QTextureFileReader::init()
diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h
index cc7cbcb559..f0e72e3814 100644
--- a/src/gui/util/qvalidator.h
+++ b/src/gui/util/qvalidator.h
@@ -69,6 +69,7 @@ public:
         Intermediate,
         Acceptable
     };
+    Q_ENUM(State)
 
     void setLocale(const QLocale &locale);
     QLocale locale() const;
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri
index 6324642505..e5e711b1a0 100644
--- a/src/gui/util/util.pri
+++ b/src/gui/util/util.pri
@@ -19,7 +19,8 @@ HEADERS += \
         util/qtexturefilereader_p.h \
         util/qtexturefilehandler_p.h \
         util/qpkmhandler_p.h \
-        util/qktxhandler_p.h
+        util/qktxhandler_p.h \
+        util/qastchandler_p.h
 
 SOURCES += \
         util/qdesktopservices.cpp \
@@ -38,4 +39,5 @@ SOURCES += \
         util/qtexturefiledata.cpp \
         util/qtexturefilereader.cpp \
         util/qpkmhandler.cpp \
-        util/qktxhandler.cpp
+        util/qktxhandler.cpp \
+        util/qastchandler.cpp