diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-18 13:37:02 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 13:37:02 +0100 |
commit | ba05397ad723fa19125eb5ca2f91c7f437b21484 (patch) | |
tree | e236df3317828f02ec1e8f28d87125bcc286b2d9 /src/quick/scenegraph/scenegraph.pri | |
parent | b2c71d6518143b3d2a9bd3aef1d72ee5929891fc (diff) | |
parent | 0e64bd96fbf26855a65e38847083dbd2c6bee4ac (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
Change-Id: I7feb9772fc35066f56b7c073482b53ca8c86c70b
Diffstat (limited to 'src/quick/scenegraph/scenegraph.pri')
-rw-r--r-- | src/quick/scenegraph/scenegraph.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri index 34396dcf43..4fa3e7b6bf 100644 --- a/src/quick/scenegraph/scenegraph.pri +++ b/src/quick/scenegraph/scenegraph.pri @@ -1,4 +1,4 @@ -DEFINES += QSG_SEPARATE_INDEX_BUFFER +# DEFINES += QSG_SEPARATE_INDEX_BUFFER # DEFINES += QSG_DISTANCEFIELD_CACHE_DEBUG # Core API |