From 4510404145b2c4561989c47aedfa2cf915901d5d Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Wed, 12 Oct 2011 09:46:40 +0100
Subject: [PATCH] Build Config Fixups

We ask for phonon in src.pro, but it is NOT required, this
is because the video playback was rewritten to use the vlc
libraries.

Additionally, the build.pro now asks for ordered builds to
ensure the qwt libs are built before src is started. This is
useful when performing builds with multipe jobs (make -j n).
---
 build.pro   | 1 +
 src/src.pro | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.pro b/build.pro
index bbf54630f..ce7a1b793 100644
--- a/build.pro
+++ b/build.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = qwt src
+CONFIG += ordered
diff --git a/src/src.pro b/src/src.pro
index 7beaae20b..4ba29e669 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -8,7 +8,7 @@ DEPENDPATH += .
 
 !isEmpty( BOOST_INCLUDE ) { INCLUDEPATH += $${BOOST_INCLUDE} }
 INCLUDEPATH += ../qwt/src ../qxt/src
-QT += xml sql network webkit phonon
+QT += xml sql network webkit
 LIBS += ../qwt/lib/libqwt.a
 LIBS += -lm