From 9f0673ae717535f685f8fd30ae1383dd8efdab20 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Thu, 18 Nov 2021 14:08:40 +0000 Subject: [PATCH] Fixes to tidy-up QT6.2 support --- audiohandler.cpp | 2 +- wfview.pro | 16 ++++--- wfview.vcxproj | 94 +++++++++++++++++++++--------------------- wfview.vcxproj.filters | 8 ---- wfview.vcxproj.user | 3 ++ 5 files changed, 60 insertions(+), 63 deletions(-) diff --git a/audiohandler.cpp b/audiohandler.cpp index f440899..e28fbb4 100644 --- a/audiohandler.cpp +++ b/audiohandler.cpp @@ -750,7 +750,7 @@ void audioHandler::getNextAudioChunk(QByteArray& ret) if (currentLatency > setup.latency) { qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Packet " << hex << packet.seq << " arrived too late (increase output latency!) " << - dec << packet.time.msecsTo(QTime::currentTime()) << "ms"; + packet.time.msecsTo(QTime::currentTime()) << "ms"; // if (!ringBuf->try_read(packet)) // break; // currentLatency = packet.time.msecsTo(QTime::currentTime()); diff --git a/wfview.pro b/wfview.pro index 8f031b6..055ab1c 100644 --- a/wfview.pro +++ b/wfview.pro @@ -29,7 +29,7 @@ linux:QMAKE_LFLAGS += -O2 -s # depend on your compiler). Please consult the documentation of the # deprecated API in order to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS -DEFINES += QCUSTOMPLOT_COMPILE_LIBRARY +DEFINES += QCUSTOMPLOT_USE_LIBRARY # These defines are used for the resampler @@ -66,6 +66,7 @@ contains(DEFINES, RTAUDIO) { contains(DEFINES, PORTAUDIO) { CONFIG(debug, release|debug) { win32:LIBS += -L../portaudio/msvc/Win32/Debug/ -lportaudio_x86 + } else { win32:LIBS += -L../portaudio/msvc/Win32/Release/ -lportaudio_x86 } @@ -122,19 +123,22 @@ INSTALLS += stylesheets CONFIG(debug, release|debug) { linux: QCPLIB = qcustomplotd - win32:LIBS += -L../opus/win32/VS2015/x64/Debug/ -lopus + !linux: QCPLIB = qcustomplotd2 + win32:LIBS += -L../opus/win32/VS2015/x64/Debug/ + win32:QMAKE_PRE_LINK+=copy /Y ..\qcustomplot\qcustomplotd2.dll debug\ } else { linux: QCPLIB = qcustomplot - win32:LIBS += -L../opus/win32/VS2015/x64/Release/ -lopus + !linux: QCPLIB = qcustomplot2 + win32:LIBS += -L../opus/win32/VS2015/x64/Release/ + win32:QMAKE_PRE_LINK+=copy /Y ..\qcustomplot\qcustomplot2.dll release\ } + linux:LIBS += -L./ -l$$QCPLIB -lopus +!linux:LIBS += -L../qcustomplot/ -l$$QCPLIB -lopus macx:LIBS += -framework CoreAudio -framework CoreFoundation -lpthread -lopus -!linux:SOURCES += ../qcustomplot/qcustomplot.cpp -!linux:HEADERS += ../qcustomplot/qcustomplot.h !linux:INCLUDEPATH += ../qcustomplot - !linux:INCLUDEPATH += ../opus/include INCLUDEPATH += resampler diff --git a/wfview.vcxproj b/wfview.vcxproj index 030b9d6..72c95e1 100644 --- a/wfview.vcxproj +++ b/wfview.vcxproj @@ -1,13 +1,13 @@  - + Release - Win32 + x64 - + Debug - Win32 + x64 @@ -18,7 +18,7 @@ 10.0.19041.0 $(MSBuildProjectDirectory)\QtMsBuild - + v142 release\ false @@ -27,7 +27,7 @@ release\ wfview - + v142 debug\ false @@ -38,26 +38,27 @@ - + - + - debug\debug\wfviewtruerelease\release\wfviewtruefalsemsvc2019core;network;gui;multimedia;widgets;serialport;printsupportmsvc2019core;network;gui;multimedia;widgets;serialport;printsupport + debug\debug\wfviewtruetruerelease\release\wfviewtruefalsetruemsvc2019_64_v62core;network;gui;multimedia;widgets;serialport;printsupportmsvc2019_64_v62core;network;gui;multimedia;widgets;serialport;printsupport - + - .;..\qcustomplot;..\opus\include;resampler;rtaudio;release;/include;%(AdditionalIncludeDirectories) - -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + .;..\qcustomplot;..\opus\include;resampler;release;/include;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) release\ false None 4577;4467;%(DisableSpecificWarnings) Sync + stdcpp17 release\ MaxSpeed - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";__WINDOWS_WASAPI__;GITSHORT="66912e1";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="395469d";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) false MultiThreadedDLL @@ -66,10 +67,11 @@ Level3 true - ..\opus\win32\VS2015\Win32\Release\opus.lib;shell32.lib;%(AdditionalDependencies) - ..\opus\win32\VS2015\Win32\Release;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories) + ..\qcustomplot\qcustomplot2.lib;..\opus\win32\VS2015\x64\Release\opus.lib;$(QTDIR)\lib\Qt6Multimedia.lib;$(QTDIR)\lib\Qt6PrintSupport.lib;$(QTDIR)\lib\Qt6Widgets.lib;$(QTDIR)\lib\Qt6Gui.lib;$(QTDIR)\lib\Qt6SerialPort.lib;$(QTDIR)\lib\Qt6Network.lib;$(QTDIR)\lib\Qt6Core.lib;$(QTDIR)\lib\Qt6EntryPoint.lib;shell32.lib;%(AdditionalDependencies) + ..\opus\win32\VS2015\x64\Release;..\qcustomplot;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true + true false true false @@ -85,21 +87,26 @@ 0 - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";__WINDOWS_WASAPI__;GITSHORT=\"66912e1\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"395469d\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + + copy /Y ..\qcustomplot\qcustomplot2.dll release + copy /Y ..\qcustomplot\qcustomplot2.dll release + msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppdefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h - + - .;..\qcustomplot;..\opus\include;resampler;rtaudio;debug;/include;%(AdditionalIncludeDirectories) - -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + .;..\qcustomplot;..\opus\include;resampler;debug;/include;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) debug\ false ProgramDatabase 4577;4467;%(DisableSpecificWarnings) Sync + stdcpp17 debug\ Disabled - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";__WINDOWS_WASAPI__;GITSHORT="66912e1";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="395469d";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions) false MultiThreadedDebugDLL true @@ -107,8 +114,8 @@ Level3 true - ..\opus\win32\VS2015\Win32\Debug\opus.lib;shell32.lib;%(AdditionalDependencies) - ..\opus\win32\VS2015\Win32\Debug;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories) + ..\qcustomplot\qcustomplotd2.lib;..\opus\win32\VS2015\x64\Debug\opus.lib;$(QTDIR)\lib\Qt6Multimediad.lib;$(QTDIR)\lib\Qt6PrintSupportd.lib;$(QTDIR)\lib\Qt6Widgetsd.lib;$(QTDIR)\lib\Qt6Guid.lib;$(QTDIR)\lib\Qt6SerialPortd.lib;$(QTDIR)\lib\Qt6Networkd.lib;$(QTDIR)\lib\Qt6Cored.lib;$(QTDIR)\lib\Qt6EntryPointd.lib;shell32.lib;%(AdditionalDependencies) + ..\opus\win32\VS2015\x64\Debug;..\qcustomplot;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true true @@ -124,8 +131,12 @@ 0 - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";__WINDOWS_WASAPI__;GITSHORT=\"66912e1\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"395469d\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) + + copy /Y ..\qcustomplot\qcustomplotd2.dll debug + copy /Y ..\qcustomplot\qcustomplotd2.dll debug + msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppdefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h @@ -137,7 +148,6 @@ - @@ -217,16 +227,6 @@ - - - - - - - - - - @@ -348,19 +348,19 @@ Document - true - $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) - cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -faligned-new -Zi -MDd -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h - Generate moc_predefs.h - debug\moc_predefs.h;%(Outputs) + true + $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -faligned-new -Zi -MDd -std:c++17 -utf-8 -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h + Generate moc_predefs.h + debug\moc_predefs.h;%(Outputs) Document - $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) - cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -fvisibility=hidden -fvisibility-inlines-hidden -faligned-new -O2 -MD -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h - Generate moc_predefs.h - release\moc_predefs.h;%(Outputs) - true + $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -fvisibility=hidden -fvisibility-inlines-hidden -faligned-new -O2 -MD -std:c++17 -utf-8 -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h + Generate moc_predefs.h + release\moc_predefs.h;%(Outputs) + true @@ -392,8 +392,6 @@ - - @@ -517,7 +515,7 @@ - resourcesresources + resourcesresources @@ -531,7 +529,7 @@ - stylestyle + stylestyle diff --git a/wfview.vcxproj.filters b/wfview.vcxproj.filters index d78480d..7c85e7c 100644 --- a/wfview.vcxproj.filters +++ b/wfview.vcxproj.filters @@ -84,9 +84,6 @@ Source Files - - Source Files - Source Files @@ -161,9 +158,6 @@ Header Files - - Header Files - Header Files @@ -260,8 +254,6 @@ - - diff --git a/wfview.vcxproj.user b/wfview.vcxproj.user index e5444ea..9c81a79 100644 --- a/wfview.vcxproj.user +++ b/wfview.vcxproj.user @@ -12,4 +12,7 @@ PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH) + + 2021-11-18T12:40:24.8966742Z + \ No newline at end of file