diff options
| author | Mats Wichmann <mats@linux.com> | 2019-04-25 19:44:24 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-04-25 19:44:24 (GMT) |
| commit | 0e84c296d686e4384c8e6f5137a7c15e51dcb167 (patch) | |
| tree | c4e043cd046190eaa7d2d6a72a5f87cc85aa23cf /src/engine | |
| parent | f3c5ac37a96adc91d688d17a9ad462a95d32587c (diff) | |
| download | SCons-0e84c296d686e4384c8e6f5137a7c15e51dcb167.zip SCons-0e84c296d686e4384c8e6f5137a7c15e51dcb167.tar.gz SCons-0e84c296d686e4384c8e6f5137a7c15e51dcb167.tar.bz2 | |
[PR #3345] fix a few more Py3.8 problems
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Conftest.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/qt.py | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/engine/SCons/Conftest.py b/src/engine/SCons/Conftest.py index 84aa992..67a5a67 100644 --- a/src/engine/SCons/Conftest.py +++ b/src/engine/SCons/Conftest.py @@ -704,7 +704,7 @@ def CheckProg(context, prog_name): # def _YesNoResult(context, ret, key, text, comment = None): - """ + r""" Handle the result of a test with a "yes" or "no" result. :Parameters: @@ -723,7 +723,7 @@ def _YesNoResult(context, ret, key, text, comment = None): def _Have(context, key, have, comment = None): - """ + r""" Store result of a test in context.havedict and context.headerfilename. :Parameters: diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py index b8cf77a..685a9a0 100644 --- a/src/engine/SCons/Tool/qt.py +++ b/src/engine/SCons/Tool/qt.py @@ -66,11 +66,17 @@ if SCons.Util.case_sensitive_suffixes('.h', '.H'): cxx_suffixes = cplusplus.CXXSuffixes -# def find_platform_specific_qt_paths(): """ - If the platform has non-standard paths which it installs QT in,return the likely default path - :return: + find non-standard QT paths + + If the platform does not put QT tools in standard search paths, + the path is expected to be set using QTDIR. SCons violates + the normal rule of not pulling from the user's environment + in this case. However, some test cases try to validate what + happens when QTDIR is unset, so we need to try to make a guess. + + :return: a guess at a path """ # qt_bin_dirs = [] @@ -83,6 +89,7 @@ def find_platform_specific_qt_paths(): # Centos installs QT under /usr/{lib,lib64}/qt{4,5,-3.3}/bin # so we need to handle this differently # qt_bin_dirs = glob.glob('/usr/lib64/qt*/bin') + # TODO: all current Fedoras do the same, need to look deeper here. qt_bin_dir = '/usr/lib64/qt-3.3/bin' return qt_bin_dir |