Merge branch 'qt6' of git@gitcode.net:coloreaglestdio/taskbus.git into qt6

35d2991b · dev@win10Host.com · 12919a3d · 83ab11b5 · 35d2991b · 35d2991b
5 changed file
--- a/modules/3rdlibs/win32/fftw/x64/fftw3-3.lib
+++ b/modules/3rdlibs/win32/fftw/x64/fftw3-3.lib
--- a/modules/3rdlibs/win32/fftw/x86/fftw3-3.lib
+++ b/modules/3rdlibs/win32/fftw/x86/fftw3-3.lib
--- a/modules/3rdlibs/win32/libiio/MS32/iio.lib
+++ b/modules/3rdlibs/win32/libiio/MS32/iio.lib
--- a/modules/3rdlibs/win32/libiio/MS64/iio.lib
+++ b/modules/3rdlibs/win32/libiio/MS64/iio.lib
--- a/modules/transforms/transform_fft/transform_fft.pro
+++ b/modules/transforms/transform_fft/transform_fft.pro
@@ -12,13 +12,10 @@ DISTFILES += \
    transform_fft.json

 win32{
-    mkoptions = $$find(QMAKESPEC, "vc")
-    count(mkoptions, 1){
    INCLUDEPATH +="$$PWD/../../3rdlibs/win32/fftw"
    contains(QT_ARCH, i386) {
 	LIBS+=-L"$$PWD/../../3rdlibs/win32/fftw/x86" -llibfftw3-3
    } else {
 	LIBS+=-L"$$PWD/../../3rdlibs/win32/fftw/x64" -llibfftw3-3
    }
-    } else: LIBS+=-lfftw3
 }else: LIBS+=-lfftw3