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 | |
| 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
| -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') | |||
| 196 | 196 | ||
| 197 | def _detect(env): | 197 | def _detect(env): |
| 198 | """Not really safe, but fast method to detect the QT library""" | 198 | """Not really safe, but fast method to detect the QT library""" |
| 199 | try: return env['QTDIR'] | 199 | if 'QTDIR' in env : |
| 200 | except KeyError: pass | 200 | return env['QTDIR'] |
| 201 | 201 | ||
| 202 | try: return os.environ['QTDIR'] | 202 | if 'QTDIR' in os.environ : |
| 203 | except KeyError: pass | 203 | return os.environ['QTDIR'] |
| 204 | 204 | ||
| 205 | moc = None | 205 | moc = None |
| 206 | if env["qt5"]: | 206 | 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" : | |||
| 13 | if "Swift" in env["PROJECTS"] : | 13 | if "Swift" in env["PROJECTS"] : |
| 14 | print "Warning: Swift requires Qt. Not building the Swift Qt application." | 14 | print "Warning: Swift requires Qt. Not building the Swift Qt application." |
| 15 | env["PROJECTS"].remove("Swift") | 15 | env["PROJECTS"].remove("Swift") |
| 16 | elif env["target"] == "native": | 16 | elif not GetOption("help") and env["target"] == "native": |
| 17 | SConscript("QtUI/SConscript") | 17 | SConscript("QtUI/SConscript") |