diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-09-16 09:55:50 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-09-16 08:13:39 +0000 |
| commit | ee17289dc97ccac865ab31e4c48c99587feab6cd (patch) | |
| tree | 025926bb7ea19e4766f07fd0386766f4baa5f6bb | |
| parent | 97710f429fb06914b5cb86fdd3aa333eb8a90dff (diff) | |
Fix out of source builds on windows
Change-Id: If4d03e889dda3cf7557c3d41dda4ffad8790f2e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/3rdparty/freetype/freetype.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/compiler/preprocessor/preprocessor.pro | 2 | ||||
| -rw-r--r-- | 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) |