diff options
| author | Matthew Waters <matthew@centricular.com> | 2018-06-07 05:21:25 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-07 12:56:49 +0000 |
| commit | a7fc3fe3561c0b15a5263192a1645c765adf0ec2 (patch) | |
| tree | 1dde3f03d9ac7aa8ca228faadd37a3af0a8d978d | |
| parent | 2d3bfa0778d3f7068585c82e991a25c0ce79fbac (diff) | |
| download | meson-a7fc3fe3561c0b15a5263192a1645c765adf0ec2.zip meson-a7fc3fe3561c0b15a5263192a1645c765adf0ec2.tar.gz meson-a7fc3fe3561c0b15a5263192a1645c765adf0ec2.tar.bz2 | |
dependencies/qt: fix debugoptimized builds with qt
debugoptimized builds building against Qt would ultimately link against
both the debug and non-debug msvcrt, ntdll, etc libraries which causes
crashes in weird places and is very much not recommended by Microsoft.
This changes the selected Qt library(ies) correctly to not uses the
debug variants for debugoptimized builds.
https://github.com/mesonbuild/meson/pull/3680
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 1f8c3f5..ceadde5 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -347,7 +347,7 @@ class QtBaseDependency(ExternalDependency): for dir in priv_inc: self.compile_args.append('-I' + dir) if for_windows(self.env.is_cross_build(), self.env): - is_debug = self.env.coredata.get_builtin_option('buildtype').startswith('debug') + is_debug = self.env.coredata.get_builtin_option('buildtype') == 'debug' dbg = 'd' if is_debug else '' if self.qtver == '4': base_name = 'Qt' + module + dbg + '4' |