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/common/common.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/common/common.pri')
| -rw-r--r-- | src/angle/src/common/common.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index dfe15546f5..43ac3ee8db 100644 --- a/src/angle/src/common/common.pri +++ b/src/angle/src/common/common.pri @@ -7,6 +7,11 @@ INCLUDEPATH += \ LIBS_PRIVATE = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI +lib_replace.match = $$[QT_INSTALL_LIBS/get] +lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +lib_replace.CONFIG = path +QMAKE_PRL_INSTALL_REPLACE += lib_replace + # DirectX is included in the Windows 8 Kit, but everything else requires the DX SDK. win32-msvc2012|win32-msvc2013|winrt { FXC = fxc.exe |