From 420654a8e323beb7c8877453393568240a3f2a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Fri, 29 Oct 2010 19:25:57 +0200
Subject: Make Qt non-mandatory for global build.


diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index e241746..11bd0b1 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -527,6 +527,14 @@ if env["PLATFORM"] == "darwin" :
 		env["HAVE_IOKIT"] = True
 	cocoa_conf.Finish()
 
+# Qt
+try :
+	myenv = env.Clone()
+	myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
+	env["HAVE_QT"] = True
+except :
+	env["HAVE_QT"] = False
+
 ################################################################################
 # DocBook setup
 ################################################################################
diff --git a/Swift/SConscript b/Swift/SConscript
index 0064eee..ee0140c 100644
--- a/Swift/SConscript
+++ b/Swift/SConscript
@@ -7,7 +7,9 @@ SConscript("Controllers/SConscript")
 if env["SCONS_STAGE"] == "build" :
 	if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) :
 		print "Error: Swift requires OpenSSL support, and OpenSSL was not found."
-		Exit(1)
-
-	if env["target"] == "native":
+		env["PROJECTS"].remove("Swift")
+	elif not GetOption("help") and not env.get("HAVE_QT", 0) :
+		print "Error: Swift requires Qt. Not building Swift."
+		env["PROJECTS"].remove("Swift")
+	elif env["target"] == "native":
 		 SConscript("QtUI/SConscript")
-- 
cgit v0.10.2-6-g49f6