16 files changed, 16 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index 712408e..fc04978 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,5 @@ config.log
 .sconf_temp
 .sconsign.dblite
 Swiften/Examples/TuneBot/TuneBot
-Swiften/QA/ClientTest/ClientTest
 Swift/QtUI/swift
 Swift/QtUI/DefaultTheme.qrc
diff --git a/QA/Checker/SConscript b/QA/Checker/SConscript
new file mode 100644
index 0000000..7516bb9
--- /dev/null
+++ b/QA/Checker/SConscript
@@ -0,0 +1,10 @@
+Import("env")
+
+checker_env = env.Clone()
+checker_env.MergeFlags(env["CPPUNIT_FLAGS"])
+checker_env.Library("Checker", "checker.cpp")
+env["CHECKER_FLAGS"] = { 
+    "LIBS": ["Checker"],
+    "LIBPATH": [Dir(".")],
+		"LINKFLAGS": ["/SUBSYSTEM:CONSOLE"] if env["PLATFORM"] == "win32" else []
+  }
diff --git a/QA/UnitTest/checker.cpp b/QA/Checker/checker.cpp
index b59cea6..b59cea6 100644
--- a/QA/UnitTest/checker.cpp
+++ b/QA/Checker/checker.cpp
diff --git a/QA/SConscript b/QA/SConscript
deleted file mode 100644
index feafb0c..0000000
--- a/QA/SConscript
+++ /dev/null
@@ -1,4 +0,0 @@
-SConscript(dirs = [
-    "UnitTest",
-    "Swiften"
-  ])
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index f93cdc2..f4bb358 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -2,16 +2,6 @@ import os
 
 Import("env")
 
-# The checker
-checker_env = env.Clone()
-checker_env.MergeFlags(env["CPPUNIT_FLAGS"])
-checker_env.Library("Checker", "checker.cpp")
-env["CHECKER_FLAGS"] = { 
-    "LIBS": ["Checker"],
-    "LIBPATH": [Dir(".")],
-		"LINKFLAGS": ["/SUBSYSTEM:CONSOLE"] if env["PLATFORM"] == "win32" else []
-  }
-
 if env["TEST"] :
 	myenv = env.Clone()
 	myenv.MergeFlags(env["CHECKER_FLAGS"])
diff --git a/SConstruct b/SConstruct
index 6ee509a..51bf6a5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -270,6 +270,9 @@ SConscript(dirs = [
 		"3rdParty/LibIDN",
 		"3rdParty/SQLite"])
 
+# Checker
+SConscript(dirs = ["QA/Checker"])
+
 # Swiften
 SConscript(dirs = "Swiften")
 
@@ -281,8 +284,8 @@ for dir in os.listdir(".") :
 	if os.path.isfile(sconscript) :
 		SConscript(sconscript)
 
-# QA
-SConscript(dirs = "QA")
+# Unit test runner
+SConscript(dirs = ["QA/UnitTest"])
 
 ################################################################################
 # Print summary
diff --git a/QA/Swiften/ClientTest/.gitignore b/Swiften/QA/ClientTest/.gitignore
index 9fb3e67..9fb3e67 100644
--- a/QA/Swiften/ClientTest/.gitignore
+++ b/Swiften/QA/ClientTest/.gitignore
diff --git a/QA/Swiften/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index 412eb53..412eb53 100644
--- a/QA/Swiften/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.cpp
diff --git a/QA/Swiften/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript
index a9d9a19..a9d9a19 100644
--- a/QA/Swiften/ClientTest/SConscript
+++ b/Swiften/QA/ClientTest/SConscript
diff --git a/QA/Swiften/NetworkTest/.gitignore b/Swiften/QA/NetworkTest/.gitignore
index 5a3caca..5a3caca 100644
--- a/QA/Swiften/NetworkTest/.gitignore
+++ b/Swiften/QA/NetworkTest/.gitignore
diff --git a/QA/Swiften/NetworkTest/BoostConnectionServerTest.cpp b/Swiften/QA/NetworkTest/BoostConnectionServerTest.cpp
index a5c51aa..a5c51aa 100644
--- a/QA/Swiften/NetworkTest/BoostConnectionServerTest.cpp
+++ b/Swiften/QA/NetworkTest/BoostConnectionServerTest.cpp
diff --git a/QA/Swiften/NetworkTest/BoostConnectionTest.cpp b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
index 9929eaa..9929eaa 100644
--- a/QA/Swiften/NetworkTest/BoostConnectionTest.cpp
+++ b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
diff --git a/QA/Swiften/NetworkTest/DomainNameResolverTest.cpp b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
index 8968efd..8968efd 100644
--- a/QA/Swiften/NetworkTest/DomainNameResolverTest.cpp
+++ b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
diff --git a/QA/Swiften/NetworkTest/SConscript b/Swiften/QA/NetworkTest/SConscript
index cf66a68..cf66a68 100644
--- a/QA/Swiften/NetworkTest/SConscript
+++ b/Swiften/QA/NetworkTest/SConscript
diff --git a/QA/Swiften/SConscript b/Swiften/QA/SConscript
index ede7b39..ede7b39 100644
--- a/QA/Swiften/SConscript
+++ b/Swiften/QA/SConscript
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 86c2a81..148f1f8 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -93,6 +93,7 @@ SConscript(dirs = [
 		"History",
 		"StreamStack",
 		"LinkLocal",
+		"QA",
 	])
 
 myenv.StaticLibrary("Swiften", sources + swiften_env["SWIFTEN_OBJECTS"])