diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:07:02 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:08:49 +0200 |
| commit | 189dc655bbb3b4f9e1e11596f5a0f4682326066d (patch) | |
| tree | 67527f791542775394332c2995887994bde9adc9 /src/angle/src/config.pri | |
| parent | 6fd5870df0fbad0187b6d8bf7e3b12afb2e7a66f (diff) | |
| parent | dfe853bff90444edf92a993e391df853780c9e8d (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/image/qimage.cpp
src/gui/image/qppmhandler.cpp
src/gui/kernel/qguiapplication.cpp
src/gui/painting/qpaintengine_raster.cpp
Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765
Diffstat (limited to 'src/angle/src/config.pri')
| -rw-r--r-- | src/angle/src/config.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri index 07a18620da..f23bebef44 100644 --- a/src/angle/src/config.pri +++ b/src/angle/src/config.pri @@ -41,6 +41,8 @@ DEFINES += _WINDOWS \ CONFIG += angle_d3d11 # Remove to disable D3D11 renderer +equals(QMAKE_TARGET_OS, xp): CONFIG -= angle_d3d11 + angle_d3d11 { DEFINES += ANGLE_ENABLE_D3D11 ANGLE_DEFAULT_D3D11=1 !build_pass: message("Enabling D3D11 mode for ANGLE") |