Swiftdiff options
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 8 | ||||
| -rw-r--r-- | Swift/SConscript | 2 |
2 files changed, 5 insertions, 5 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"]: diff --git a/Swift/SConscript b/Swift/SConscript index 9f1a213..566019c 100644 --- a/Swift/SConscript +++ b/Swift/SConscript @@ -13,5 +13,5 @@ if env["SCONS_STAGE"] == "build" : if "Swift" in env["PROJECTS"] : print "Warning: Swift requires Qt. Not building the Swift Qt application." env["PROJECTS"].remove("Swift") - elif env["target"] == "native": + elif not GetOption("help") and env["target"] == "native": SConscript("QtUI/SConscript") |