changeset 576:deabb09d994b sv_v2.1

Merge
author Chris Cannam
date Thu, 16 May 2013 14:16:56 +0100
parents 7941d4f15037 (current diff) c8e1c9dcb41a (diff)
children a866380b3698 31940304272f 85dfb786f9dd a8da6db5a2c9
files .hgsubstate platform-dataquay.pri
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Thu May 16 14:06:13 2013 +0100
+++ b/.hgsubstate	Thu May 16 14:16:56 2013 +0100
@@ -1,4 +1,4 @@
 7096c7de2d4c327de5e028c33036f146a1884706 dataquay
 8cb01cd2441d1009fce5c1234ecbe033ce45484a svapp
-b18f8c5fb4f5c74700257b6d2c94bd247c1582f2 svcore
+f85050b6f5229c083f639811aa39a87c8afa7820 svcore
 77fa3fdbfc7e2b9f96eac6524d48294fb47760c3 svgui
--- a/platform-dataquay.pri	Thu May 16 14:06:13 2013 +0100
+++ b/platform-dataquay.pri	Thu May 16 14:16:56 2013 +0100
@@ -8,6 +8,4 @@
 EXTRALIBS -= -lrdf
 
 DEFINES += USE_SORD
-QMAKE_CXXFLAGS += -I/usr/local/include/sord-0 -I/usr/local/include/serd-0 -I/usr/include/sord-0 -I/usr/include/serd-0
-EXTRALIBS += -lsord-0 -lserd-0
-
+# Libraries and paths should be added by config.pri