diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:51:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 09:57:44 +0100 |
| commit | a2c6c81f5c67390629a313ff7ba985d0967ca1fa (patch) | |
| tree | e812286604ff3b34fe6678e145590b739de6d72b /tools | |
| parent | 4f46ccc4517a52b152d36e7734c2042e06ea8de3 (diff) | |
| parent | 1c52a489c1eed52107cdde28890ca230424bd85b (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/input/backend/updateaxisactionjob.cpp
src/render/renderstates/qalphacoverage.cpp
src/render/renderstates/qclipplane.cpp
src/render/renderstates/qdithering.cpp
src/render/renderstates/qseamlesscubemap.cpp
src/render/renderstates/qstenciltest.cpp
Change-Id: I5b279d30bbbb06af5e8ee9fc47e9794b78a567f5
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qgltf/qgltf.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro index a19f2e91c..df6dfa202 100644 --- a/tools/qgltf/qgltf.pro +++ b/tools/qgltf/qgltf.pro @@ -1,5 +1,4 @@ option(host_build) -!cross_compile:load(qt_build_paths) # Qt3D is free of Q_FOREACH - make sure it stays that way: DEFINES *= QT_NO_FOREACH |