Merge lp:~dandrader/qtmir/optionalTestsBuild into lp:qtmir

[Daniel d'Andrada]

CONFIG+=no_tests to avoid building the tests and therefore speed up the build

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

[Gerry Boland (gerboland)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/qtmir-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/80/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/80/rebuild

review: Approve (continuous-integration)

=== modified file 'README'
--- README	2014-08-28 16:25:07 +0000
+++ README	2014-09-22 14:30:06 +0000
@@ -12,7 +12,8 @@
 $ qmake CONFIG+=debug
 (is good to "make clean" beforehand)
 
-
+To avoid building the tests (to speed up the build):
+$ qmake CONFIG+=no_tests
 
 To test, enter the demos directory, run:
 

=== modified file 'qtmir.pro'
--- qtmir.pro	2014-07-01 13:38:06 +0000
+++ qtmir.pro	2014-09-22 14:30:06 +0000
@@ -1,3 +1,7 @@
 TEMPLATE = subdirs
-SUBDIRS = src tests
-tests.depends = src
+SUBDIRS = src
+
+!no_tests {
+    SUBDIRS += tests
+    tests.depends = src
+}