diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:24:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:24:03 +0200 |
| commit | cb5cbe9eb7c9a68acbe19ff2fd0c299e30f42eca (patch) | |
| tree | 2ba783322c213c9c533163dc69c950367f767a44 /src/quick/scenegraph/coreapi | |
| parent | 8de7ec4bf82c35ff1413fb5f5a5ca1788dc93af3 (diff) | |
| parent | 16914894f035963ace51c92de13aad11a53c3cf8 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/compiler/qv4isel_moth_p.h
Change-Id: I8e86a649d1ef8ad27dc66cc8c290093b2faabc69
Diffstat (limited to 'src/quick/scenegraph/coreapi')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp index 4bec7b19f4..13598bbe1d 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp @@ -681,7 +681,6 @@ QSGMaterial::~QSGMaterial() the full matrix of the geometry nodes for rendering. \value CustomCompileStep Starting with Qt 5.2, the scene graph will not always call - QSGMaterialShader::compile() when its shader program is compiled and linked. Set this flag to enforce that the function is called. |