From ee17289dc97ccac865ab31e4c48c99587feab6cd Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 16 Sep 2016 09:55:50 +0200 Subject: [PATCH] Fix out of source builds on windows Change-Id: If4d03e889dda3cf7557c3d41dda4ffad8790f2e0 Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- src/3rdparty/freetype/freetype.pro | 2 +- src/angle/src/compiler/preprocessor/preprocessor.pro | 2 +- src/angle/src/compiler/translator.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro index 1e12dadc5d..6d630d4190 100644 --- a/src/3rdparty/freetype/freetype.pro +++ b/src/3rdparty/freetype/freetype.pro @@ -69,7 +69,7 @@ DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB include(../zlib_dependency.pri) QT_FOR_CONFIG += gui-private -include(../../gui/qtgui-config.pri) +include($$OUT_PWD/../../gui/qtgui-config.pri) DEFINES += FT_CONFIG_OPTION_USE_PNG include($$PWD/../png_dependency.pri) diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro index c13cf7ba8d..9d0728a72d 100644 --- a/src/angle/src/compiler/preprocessor/preprocessor.pro +++ b/src/angle/src/compiler/preprocessor/preprocessor.pro @@ -1,5 +1,5 @@ CONFIG += static -include(../../../../gui/qtgui-config.pri) +include($$OUT_PWD/../../../../gui/qtgui-config.pri) qtConfig(dynamicgl): CONFIG += not_installed include(../../config.pri) diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro index 4c0a05e45c..2e5adaee96 100644 --- a/src/angle/src/compiler/translator.pro +++ b/src/angle/src/compiler/translator.pro @@ -1,5 +1,5 @@ CONFIG += static -include(../../../gui/qtgui-config.pri) +include($$OUT_PWD/../../../gui/qtgui-config.pri) qtConfig(dynamicgl): CONFIG += not_installed include(../config.pri)