comparison sv.pro @ 528:e5e6625deb85 qt5

Update for Qt5 compatibility; use subrepo for dataquay

 TEMPLATE = app
 
 include(config.pri)
 
 CONFIG += qt thread warn_on stl rtti exceptions
-QT += network xml gui
+QT += network xml gui widgets
 
 TARGET = "Sonic Visualiser"
 linux*:TARGET = sonic-visualiser
 solaris*:TARGET = sonic-visualiser
 

 ICON = icons/sv-macicon.icns
 RC_FILE = icons/sv.rc
 
 contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
 
-LIBS = -Lsvapp -Lsvgui -Lsvcore -lsvapp -lsvgui -lsvcore $$LIBS
+MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -lsvapp -lsvgui -lsvcore -ldataquay
+
+linux* {
+MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
+}
+
+LIBS = $$MY_LIBS $$LIBS
 
 win* {
 PRE_TARGETDEPS += svapp/svapp.lib \
                   svgui/svgui.lib \
-                  svcore/svcore.lib
+                  svcore/svcore.lib \
+                  dataquay/dataquay.lib
 }
 !win* {
 PRE_TARGETDEPS += svapp/libsvapp.a \
                   svgui/libsvgui.a \
-                  svcore/libsvcore.a
+                  svcore/libsvcore.a \
+                  dataquay/libdataquay.a
 }
 
 RESOURCES += sonic-visualiser.qrc
 
 HEADERS += main/MainWindow.h \
-           main/PreferencesDialog.h \
-           main/Surveyer.h
+           main/PreferencesDialog.h
 SOURCES += main/main.cpp \
            main/OSCHandler.cpp \
            main/MainWindow.cpp \
-           main/PreferencesDialog.cpp \
-           main/Surveyer.cpp
+           main/PreferencesDialog.cpp 
 
 # for mac integration
 QMAKE_INFO_PLIST = deploy/osx/Info.plist