Swiftdiff options
Diffstat (limited to 'BuildTools/SCons/Tools/qt4.py')
| -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 @@ -193,17 +193,17 @@ class _Automoc: AutomocShared = _Automoc('SharedObject') 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"]: moc = env.WhereIs('moc-qt5') or env.WhereIs('moc5') or env.WhereIs('moc') else : moc = env.WhereIs('moc-qt4') or env.WhereIs('moc4') or env.WhereIs('moc') |