diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-15 21:08:50 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-15 21:08:50 +0200 |
| commit | f23ad9d576267676066da7f6c2c9b1743de9fae4 (patch) | |
| tree | 03147f35bc21f07d818feddfa8f25159b6c40c5b /examples/quick/scenegraph/simplematerial/main.qml | |
| parent | d7ebaa1611758a9677809d77e0b11f501c103f8d (diff) | |
| parent | 20b96e21090fd008cc4a0d39300402fa3865d705 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/quick/demos/photoviewer/deployment.pri
One side made it redundant; the other removed part of it; remove it all !
src/quick/scenegraph/util/qsgatlastexture.cpp
One side changed a preprocessor condition, the other a code condition,
on adjacent lines; keep both changes.
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
One side changed a condition, the other the content of its block; keep both.
Change-Id: Idb8937f92a7edb28212449dfe0c5cfdb8e6de986
Diffstat (limited to 'examples/quick/scenegraph/simplematerial/main.qml')
0 files changed, 0 insertions, 0 deletions