2 files changed, 39 insertions, 36 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index 53c38f5..5c19432 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -3,26 +3,29 @@ import os
 Import("env")
 
 if env["TEST"] :
-	if env["SCONS_STAGE"] == "flags" :
-		env["UNITTEST_SOURCES"] = []
-		env["UNITTEST_OBJECTS"] = []
-	if env["SCONS_STAGE"] == "build" :
-		myenv = env.Clone()
-		myenv.UseFlags(env.get("CHECKER_FLAGS",""))
-		myenv.UseFlags(env.get("SLIMBER_FLAGS",""))
-		myenv.UseFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
-		myenv.UseFlags(env.get("SWIFTOOLS_FLAGS",""))
-		myenv.UseFlags(env.get("LIMBER_FLAGS",""))
-		myenv.UseFlags(env.get("SWIFTEN_FLAGS",""))
-		myenv.UseFlags(env.get("CPPUNIT_FLAGS",""))
-		myenv.UseFlags(env.get("SWIFTEN_DEP_FLAGS", ""))
-		if env.get("HAVE_LIBXML") :
-			myenv.Append(CPPDEFINES = ["HAVE_LIBXML"])
-		if env.get("HAVE_EXPAT") :
-			myenv.Append(CPPDEFINES = ["HAVE_EXPAT"])
-		if env["TEST_CREATE_LIBRARIES"] :
-			lib = myenv.StaticLibrary("Swift_UnitTests", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"])
-			myenv.Program("checker", lib)
-		else :
-			checker = myenv.Program("checker", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"])
-			myenv.Test(checker, is_checker = True)
-\ No newline at end of file
+    if env["SCONS_STAGE"] == "flags" :
+        env["UNITTEST_SOURCES"] = []
+        env["UNITTEST_OBJECTS"] = []
+    if env["SCONS_STAGE"] == "build" :
+        myenv = env.Clone()
+        myenv.UseFlags(env.get("CHECKER_FLAGS",""))
+        myenv.UseFlags(env.get("INJECTED_UNITTEST_FLAGS","")) # So things that piggy-back our build system can piggy-back our test system too
+        myenv.UseFlags(env.get("SLIMBER_FLAGS",""))
+        myenv.UseFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
+        myenv.UseFlags(env.get("SWIFTOOLS_FLAGS",""))
+        myenv.UseFlags(env.get("LIMBER_FLAGS",""))
+        myenv.UseFlags(env.get("SWIFTEN_FLAGS",""))
+        myenv.UseFlags(env.get("CPPUNIT_FLAGS",""))
+        myenv.UseFlags(env.get("GOOGLETEST_FLAGS", ""))
+        myenv.UseFlags(env.get("SWIFTEN_DEP_FLAGS", ""))
+        myenv.UseFlags(env.get("SWIFT_QTUI_TEST_FLAGS", ""))
+        if env.get("HAVE_LIBXML") :
+            myenv.Append(CPPDEFINES = ["HAVE_LIBXML"])
+        if env.get("HAVE_EXPAT") :
+            myenv.Append(CPPDEFINES = ["HAVE_EXPAT"])
+        if env["TEST_CREATE_LIBRARIES"] :
+            lib = myenv.StaticLibrary("Swift_UnitTests", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"])
+            myenv.Program("checker", lib)
+        else :
+            checker = myenv.Program("checker", env["UNITTEST_SOURCES"] + env["UNITTEST_OBJECTS"])
+            myenv.Test(checker, is_checker = True)
diff --git a/QA/UnitTest/template/FooTest.cpp b/QA/UnitTest/template/FooTest.cpp
index 7619ad1..adddb5b 100644
--- a/QA/UnitTest/template/FooTest.cpp
+++ b/QA/UnitTest/template/FooTest.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -10,19 +10,19 @@
 using namespace Swift;
 
 class FooTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(FooTest);
-		CPPUNIT_TEST(testBar);
-		CPPUNIT_TEST_SUITE_END();
+        CPPUNIT_TEST_SUITE(FooTest);
+        CPPUNIT_TEST(testBar);
+        CPPUNIT_TEST_SUITE_END();
 
-	public:
-		void setUp() {
-		}
+    public:
+        void setUp() {
+        }
 
-		void tearDown() {
-		}
+        void tearDown() {
+        }
 
-		void testBar() {
-		}
+        void testBar() {
+        }
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FooTest);