diff options
| author | Mats Wichmann <mats@linux.com> | 2021-11-07 20:39:50 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2021-11-11 22:19:53 (GMT) |
| commit | 5093d3f59a2d33db040eb04ed4057cbd6bbd71b6 (patch) | |
| tree | 8121fc5ac3afc318e8f092e36e4473c44d2bfb91 /SCons/Tool/qt.py | |
| parent | 6051c8beb7bc59f083552e9f431733e93fd56360 (diff) | |
| download | SCons-5093d3f59a2d33db040eb04ed4057cbd6bbd71b6.zip SCons-5093d3f59a2d33db040eb04ed4057cbd6bbd71b6.tar.gz SCons-5093d3f59a2d33db040eb04ed4057cbd6bbd71b6.tar.bz2 | |
Deprecate the qt tool.
Updates tests to disable the warning that this change enables.
Fix runtest.py to make sure -o logging option captures all the output.
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'SCons/Tool/qt.py')
| -rw-r--r-- | SCons/Tool/qt.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/SCons/Tool/qt.py b/SCons/Tool/qt.py index 494fab0..ff99565 100644 --- a/SCons/Tool/qt.py +++ b/SCons/Tool/qt.py @@ -38,6 +38,7 @@ import SCons.Scanner import SCons.Tool import SCons.Util import SCons.Tool.cxx +import SCons.Warnings cplusplus = SCons.Tool.cxx class ToolQtWarning(SCons.Warnings.SConsWarning): @@ -270,6 +271,10 @@ def generate(env): Action = SCons.Action.Action Builder = SCons.Builder.Builder + SCons.Warnings.warn( + SCons.Warnings.ToolQtDeprecatedWarning, "Tool module for Qt version 3 is deprecated" + ) + env.SetDefault(QTDIR = _detect(env), QT_BINPATH = os.path.join('$QTDIR', 'bin'), QT_CPPPATH = os.path.join('$QTDIR', 'include'), |