Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-07-06 09:02:33 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-07-07 10:04:44 (GMT) |
| commit | 88e392fd98a1d49d787860f4b504a01f082c6ae6 (patch) | |
| tree | 48e0790f9314154462fff0de528aa76b2783c3bf /BuildTools/SCons/Tools | |
| parent | 54dc62706f601bf2a19f9ecd752b531aa3bbf418 (diff) | |
| download | swift-88e392fd98a1d49d787860f4b504a01f082c6ae6.zip swift-88e392fd98a1d49d787860f4b504a01f082c6ae6.tar.bz2 | |
Fix './scons --help' if no Qt installation can be found
Test-Information:
Tested on Elementary OS 0.2.
Change-Id: Ieae4fc2a2c6fdfaaac9895153b09c9504ef71495
Diffstat (limited to 'BuildTools/SCons/Tools')
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index 1fe2294..6c54b1e 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -196,11 +196,11 @@ AutomocStatic = _Automoc('StaticObject') def _detect(env): """Not really safe, but fast method to detect the QT library""" - try: return env['QTDIR'] - except KeyError: pass + if 'QTDIR' in env : + return env['QTDIR'] - try: return os.environ['QTDIR'] - except KeyError: pass + if 'QTDIR' in os.environ : + return os.environ['QTDIR'] moc = None if env["qt5"]: |