# HG changeset patch
# User Chris Cannam
# Date 1445260627 -3600
# Node ID a3d73feeb850dc66750f50bbfa7b9c4dfc10b45f
# Parent  d8013f97df3cae53f29f283afcd92983884c5440# Parent  fcc7e62bfac76adcd06c1147b74d1b9e02f7122e
Merge from branch "2.0-integration"

diff -r d8013f97df3c -r a3d73feeb850 bq.pro
--- a/bq.pro	Mon Oct 19 11:56:22 2015 +0100
+++ b/bq.pro	Mon Oct 19 14:17:07 2015 +0100
@@ -4,6 +4,7 @@
 win32-g++ {
     INCLUDEPATH += sv-dependency-builds/win32-mingw/include
     LIBS += -Lsv-dependency-builds/win32-mingw/lib
+    DEFINES += USE_OWN_ALIGNED_MALLOC
 }
 win32-msvc* {
     INCLUDEPATH += sv-dependency-builds/win32-msvc/include
diff -r d8013f97df3c -r a3d73feeb850 deploy/win32/tony.wxs
--- a/deploy/win32/tony.wxs	Mon Oct 19 11:56:22 2015 +0100
+++ b/deploy/win32/tony.wxs	Mon Oct 19 14:17:07 2015 +0100
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="1.0"
+      Version="2.0"
       UpgradeCode="3F073027-A65B-4688-906C-5F64597C5BB1"
       Manufacturer="Queen Mary, University of London">
     
@@ -137,6 +137,11 @@
                 DiskId="1"
                 Source="release\Qt5Network.dll"/>
             <File
+                Id="QtSvg"
+                Name="Qt5Svg.dll"
+                DiskId="1"
+                Source="release\Qt5Svg.dll"/>
+            <File
                 Id="QtWidgets"
                 Name="Qt5Widgets.dll"
                 DiskId="1"
diff -r d8013f97df3c -r a3d73feeb850 tonyapp.pro
--- a/tonyapp.pro	Mon Oct 19 11:56:22 2015 +0100
+++ b/tonyapp.pro	Mon Oct 19 14:17:07 2015 +0100
@@ -60,7 +60,7 @@
 }
 
 win* {
-MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release $$MY_LIBS
+MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release -Lrelease $$MY_LIBS
 }
 
 LIBS = $$MY_LIBS $$LIBS