diff runner.pro @ 81:9f78c80c80f1

Merge from qt5 branch. We now require qt5 for Sonic Annotator

--- a/runner.pro	Thu Mar 28 14:53:24 2013 +0000
+++ b/runner.pro	Wed May 08 16:52:37 2013 +0100
@@ -4,7 +4,7 @@
 
 CONFIG += qt thread warn_on stl rtti exceptions console
 QT += xml network
-QT -= gui
+QT -= gui widgets
 
 # Using the "console" CONFIG flag above should ensure this happens for
 # normal Windows builds, but the console feature doesn't get picked up
@@ -21,7 +21,7 @@
 TARGET = sonic-annotator
 
 DEPENDPATH += . svcore
-INCLUDEPATH += . svcore
+INCLUDEPATH += . dataquay svcore
 
 QMAKE_LIBDIR = svcore $$QMAKE_LIBDIR
 
@@ -32,7 +32,13 @@
 
 contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
 
-LIBS = -lsvcore $$LIBS
+MY_LIBS = -Lsvcore -Ldataquay -lsvcore -ldataquay
+
+linux* {
+MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
+}
+
+LIBS = $$MY_LIBS $$LIBS
 
 PRE_TARGETDEPS += svcore/libsvcore.a
 
@@ -49,3 +55,7 @@
         runner/AudioDBFeatureWriter.cpp \
         runner/FeatureWriterFactory.cpp
 
+!win32 {
+    QMAKE_POST_LINK=/bin/bash tests/test.sh
+}
+