diff options
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgdefaultpainternode.cpp | 1 | ||||
| -rw-r--r-- | tools/qmlimportscanner/main.cpp | 8 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index f65530dd1e..8aa7139940 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -80,8 +80,6 @@ DECLARE_DEBUG_VAR(noopaque) DECLARE_DEBUG_VAR(noclip) #undef DECLARE_DEBUG_VAR -static QElapsedTimer qsg_renderer_timer; - #define QSGNODE_TRAVERSE(NODE) for (QSGNode *child = NODE->firstChild(); child; child = child->nextSibling()) #define SHADOWNODE_TRAVERSE(NODE) for (Node *child = NODE->firstChild(); child; child = child->sibling()) diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp index 475dbea393..b422eea123 100644 --- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp @@ -67,6 +67,7 @@ static inline QVector4D qsg_premultiply(const QVector4D &c, float globalOpacity) return QVector4D(c.x() * o, c.y() * o, c.z() * o, o); } +#if 0 static inline qreal qt_sRGB_to_linear_RGB(qreal f) { return f > 0.04045 ? qPow((f + 0.055) / 1.055, 2.4) : f / 12.92; @@ -85,6 +86,7 @@ static inline qreal fontSmoothingGamma() static qreal fontSmoothingGamma = QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::FontSmoothingGamma).toReal(); return fontSmoothingGamma; } +#endif class QSGTextMaskRhiShader : public QSGMaterialShader { diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp index 844247521e..d97d48c78d 100644 --- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp +++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp @@ -85,6 +85,7 @@ QSGDefaultPainterNode::QSGDefaultPainterNode(QQuickPaintedItem *item) , m_dirtyRenderTarget(false) , m_dirtyTexture(false) { + Q_UNUSED(m_multisamplingSupported); m_context = static_cast<QSGDefaultRenderContext *>(static_cast<QQuickPaintedItemPrivate *>(QObjectPrivate::get(item))->sceneGraphRenderContext()); setMaterial(&m_materialO); diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp index d1fa0991e8..27ebdae0f3 100644 --- a/tools/qmlimportscanner/main.cpp +++ b/tools/qmlimportscanner/main.cpp @@ -166,7 +166,7 @@ QVariantMap pluginsForModulePath(const QString &modulePath, const QString &versi parser.parse(QString::fromUtf8(qmldirFile.readAll())); if (parser.hasError()) { qWarning() << "qmldir file malformed at" << modulePath; - for (const auto error : parser.errors(QLatin1String("qmldir"))) + for (const auto &error : parser.errors(QLatin1String("qmldir"))) qWarning() << error.message; return QVariantMap(); } @@ -175,7 +175,7 @@ QVariantMap pluginsForModulePath(const QString &modulePath, const QString &versi QStringList pluginNameList; const auto plugins = parser.plugins(); - for (const auto plugin : plugins) + for (const auto &plugin : plugins) pluginNameList.append(plugin.name); pluginInfo[pluginsLiteral()] = pluginNameList.join(QLatin1Char(' ')); @@ -201,12 +201,12 @@ QVariantMap pluginsForModulePath(const QString &modulePath, const QString &versi QVariantList importsFromFiles; const auto components = parser.components(); - for (const auto component : components) { + for (const auto &component : components) { importsFromFiles += findQmlImportsInQmlFile(modulePath + QLatin1Char('/') + component.fileName); } const auto scripts = parser.scripts(); - for (const auto script : scripts) { + for (const auto &script : scripts) { importsFromFiles += findQmlImportsInJavascriptFile(modulePath + QLatin1Char('/') + script.fileName); } |