Mercurial > hg > tony
changeset 697:0a78db6145b2
Subrepo update
| author | Chris Cannam |
|---|---|
| date | Mon, 22 Jun 2020 17:51:12 +0100 |
| parents | 19b1ab2b24f8 |
| children | ee97c742d184 |
| files | base.pri main/MainWindow.cpp main/MainWindow.h repoint-lock.json |
| diffstat | 4 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/base.pri Tue May 12 09:24:29 2020 +0100 +++ b/base.pri Mon Jun 22 17:51:12 2020 +0100 @@ -31,6 +31,8 @@ win*: DEFINES += __WINDOWS_MM__ solaris*: DEFINES += __RTMIDI_DUMMY_ONLY__ +DEFINES += QT_DEPRECATED_WARNINGS_SINCE=0x050A00 + # Defines for Dataquay DEFINES += USE_SORD
--- a/main/MainWindow.cpp Tue May 12 09:24:29 2020 +0100 +++ b/main/MainWindow.cpp Mon Jun 22 17:51:12 2020 +0100 @@ -3176,7 +3176,7 @@ } void -MainWindow::alignmentFailed(QString message) +MainWindow::alignmentFailed(ModelId, QString message) { QMessageBox::warning (this,
--- a/main/MainWindow.h Tue May 12 09:24:29 2020 +0100 +++ b/main/MainWindow.h Mon Jun 22 17:51:12 2020 +0100 @@ -143,7 +143,7 @@ virtual void modelGenerationWarning(QString, QString); virtual void modelRegenerationFailed(QString, QString, QString); virtual void modelRegenerationWarning(QString, QString, QString); - virtual void alignmentFailed(QString); + virtual void alignmentFailed(ModelId, QString); virtual void paneRightButtonMenuRequested(Pane *, QPoint point); virtual void panePropertiesRightButtonMenuRequested(Pane *, QPoint point);
--- a/repoint-lock.json Tue May 12 09:24:29 2020 +0100 +++ b/repoint-lock.json Mon Jun 22 17:51:12 2020 +0100 @@ -1,16 +1,16 @@ { "libraries": { "vamp-plugin-sdk": { - "pin": "8ffb8985ae8f" + "pin": "0e32c328b02a" }, "svcore": { - "pin": "db489a1ece9b" + "pin": "258e356b1a7b" }, "svgui": { - "pin": "6616e1899daa" + "pin": "fe9a643b83bf" }, "svapp": { - "pin": "83ae68de4401" + "pin": "7bded7599874" }, "checker": { "pin": "e839338d3869"