diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 13:18:11 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-07 10:27:16 +0000 |
commit | 731b9e921a5ba4d768346b73e5d1849c1e582e95 (patch) | |
tree | be82a8e6bc2f2c7627aa13cf1e8fe5c7b6ee811f | |
parent | 9fbb5d485f429da022c58948937105dd9206130e (diff) |
Fix clang 5 warnings
Fixes clang develop-builds
Change-Id: If262d7038fc36bcec281be4c218b3cf3d4ae4deb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | src/qml/compiler/qv4bytecodegenerator.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickopenglshadereffect.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4bytecodegenerator.cpp b/src/qml/compiler/qv4bytecodegenerator.cpp index 96d6f78eae..0978e23b17 100644 --- a/src/qml/compiler/qv4bytecodegenerator.cpp +++ b/src/qml/compiler/qv4bytecodegenerator.cpp @@ -198,6 +198,8 @@ QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized") // broken gcc warns about Instru } QT_WARNING_POP } +#else + Q_UNUSED(debugMode); #endif const int pos = instructions.size(); diff --git a/src/quick/items/qquickopenglshadereffect.cpp b/src/quick/items/qquickopenglshadereffect.cpp index 2d3f500499..3194aa3cd0 100644 --- a/src/quick/items/qquickopenglshadereffect.cpp +++ b/src/quick/items/qquickopenglshadereffect.cpp @@ -422,8 +422,9 @@ void QQuickOpenGLShaderEffectCommon::updateShader(QQuickItem *item, d.specialType = UniformData::Opacity; uniformData[Key::FragmentShader].append(d); signalMappers[Key::FragmentShader].append(0); - const int mappedId = 1 | (Key::FragmentShader << 16); - auto mapper = new QtPrivate::MappedSlotObject([this, mappedId](){mappedPropertyChanged(mappedId);}); + auto mapper = new QtPrivate::MappedSlotObject([this](){ + mappedPropertyChanged(1 | (Key::FragmentShader << 16)); + }); const char *sourceName = "source"; d.name = sourceName; d.setValueFromProperty(item, itemMetaObject); |