diff sonic-visualiser.pro @ 568:96a0e169b70f with-dependencies

Merge from default branch

--- a/sonic-visualiser.pro	Mon May 13 11:33:51 2013 +0100
+++ b/sonic-visualiser.pro	Tue May 14 14:47:30 2013 +0100
@@ -1,17 +1,17 @@
-TEMPLATE = subdirs
-SUBDIRS = dataquay_lib svcore svgui svapp sub_sv
-
-!win* {
-    # We should build and run the tests on any platform,
-    # but doing it automatically doesn't work so well from
-    # within an IDE on Windows, so remove that from here
-    SUBDIRS += svcore/data/fileio/test
-}
-
-dataquay_lib.file = dataquay/lib.pro
-
-sub_sv.file = sv.pro
-
-svgui.depends = svcore
-svapp.depends = svcore svgui
-sub_sv.depends = svcore svgui svapp
+TEMPLATE = subdirs
+SUBDIRS = sub_dataquay svcore svgui svapp sub_sv
+
+!win* {
+    # We should build and run the tests on any platform,
+    # but doing it automatically doesn't work so well from
+    # within an IDE on Windows, so remove that from here
+    SUBDIRS += svcore/data/fileio/test
+}
+
+sub_sv.file = sv.pro
+
+sub_dataquay.file = dataquay/lib.pro
+
+svgui.depends = svcore
+svapp.depends = svcore svgui
+sub_sv.depends = svcore svgui svapp