mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix config.h issues in 3rdparty caused by new INCLUDEPATH handling in Qt 5.4.1.

Browse Source 
This commit fixes an issue caused by a new behavior in Qt 5.4.1 that
causes
PWD to be included in the default INCLUDEPATH on Windows with the nmake/VS
generators.

This new behavior was implemented in the following Qt commit:
qtbase/a90bb5b89a - centralize/unify/sanitize INCLUDEPATH "enrichment")
a90bb5b89a

This is a problem because our codecs in 3rdparty use two distinct
config.h files: one for Win32, and one for everything else.

The Win32 variant lives in the Win32 subdirectory of the build root.
The build root is the directory that will be added automatically by
the new Qt behavior. Typically, the build root has a build suffix,
for example 'speex-build'.

The regular config.h - the one for everything else but Win32 - lives
in the buildroot itself.

This new Qt behavior caused the wrong config.h file to be included
on Windows. Since the build root is now in the INCLUDEPATH,
the config.h file that lives in the build root now takes precedence
over the one in the Win32 directory.

To restore the old behavior for the codec builds, we use Qt config
option called 'no_include_pwd'. That explicitly tells qmake to not
include the PWD in the INCLUDEPATH. This restores the previous
behavior on Windows.

The 'no_include_pwd' config option has been around in Qt for a while.
It was not introduced with the aforementioned change to Qt, so it
doesn't break backwards compatibility for us.
This commit is contained in:
Mikkel Krautz 2015-03-22 03:57:45 +01:00
parent 18c359f82a
commit d855b67d10
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro vendored
View File

@ -15,6 +15,7 @@ CONFIG -= qt
CONFIG += debug_and_release
CONFIG -= warn_on
CONFIG += warn_off
CONFIG += no_include_pwd
VPATH = ../$$SOURCEDIR/libcelt
TARGET = celt0
RC_FILE = celt-0.11.0.rc

1
3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro vendored
View File

@ -15,6 +15,7 @@ CONFIG -= qt
CONFIG += debug_and_release
CONFIG -= warn_on
CONFIG += warn_off
CONFIG += no_include_pwd
VPATH = ../$$SOURCEDIR/libcelt
TARGET = celt0
RC_FILE = celt-0.7.0.rc

1
3rdparty/opus-build/opus-build.pro vendored
View File

@ -17,6 +17,7 @@ CONFIG -= qt
CONFIG += debug_and_release
#CONFIG -= warn_on
#CONFIG += warn_off
CONFIG += no_include_pwd
VPATH = ../$$SOURCEDIR
TARGET = opus
DEFINES += HAVE_CONFIG_H

1
3rdparty/speex-build/speex-build.pro vendored
View File

@ -27,6 +27,7 @@ CONFIG -= qt
CONFIG += debug_and_release
CONFIG -= warn_on
CONFIG += warn_off
CONFIG += no_include_pwd
VPATH = ../speex-src/libspeex
TARGET = speex
DEFINES += NDEBUG HAVE_CONFIG_H