Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-01-14 21:29:13 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-01-16 17:07:41 (GMT) |
| commit | 2484b358fe5b617746e544f880a45ddbbe2f4ea8 (patch) | |
| tree | 0b8e23ab94c66e16ec095554082d89761d0b6d83 | |
| parent | c15d5ef1eed6d373dab6438fdcb2480d3111e52c (diff) | |
| download | swift-2484b358fe5b617746e544f880a45ddbbe2f4ea8.zip swift-2484b358fe5b617746e544f880a45ddbbe2f4ea8.tar.bz2 | |
Remove warning about undefined QTDIR environment variable
It used to be a common way to use the QTDIR environment
variable to tell SCons the location of the Qt installation
on the system.
Swift however uses the 'qt' SCons config variable for the
location and the 'qt5' variable for the version of Qt to use.
On Unix/Linux systems with pkg-config, SCons will use it to
detect the Qt installation and its flags.
The QTDIR environment variable is rarely used and tested so
the warning about missing environment variable is removed.
Test-Information:
Tested on Debian 8.
Change-Id: I2cd793f12b8607743db2848765011cc719b106aa
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index 6d9285c..ec33b97 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -216,9 +216,6 @@ def _detect(env): if sys.platform == "darwin" : return "" QTDIR = os.path.dirname(os.path.dirname(moc)) - SCons.Warnings.warn( - QtdirNotFound, - "QTDIR variable is not defined, using moc executable as a hint (QTDIR=%s)" % QTDIR) return QTDIR raise SCons.Errors.StopError( |