From e83842f99c5c76faad4a4e85ea5cecb375da1c9c Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Thu, 12 Aug 2010 11:55:29 +0100 Subject: Fixed build failure Task-number: QTBUG-12713 --- demos/spectrum/3rdparty/fftreal/fftreal.pro | 2 ++ demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h | 4 ---- demos/spectrum/app/app.pro | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro index c9da205..6305af4 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal.pro +++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro @@ -1,5 +1,7 @@ include(../../spectrum.pri) +static: error(This library cannot be built for static linkage) + TEMPLATE = lib TARGET = fftreal diff --git a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h index b8190a9..48d614e 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h @@ -22,10 +22,6 @@ #include -#ifndef QT_DLL -# error This library is licensed under the LGPL and must be dynamically linked -#endif - #if defined(FFTREAL_LIBRARY) # define FFTREAL_EXPORT Q_DECL_EXPORT #else diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index 1b419db..4fe8b6d 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -1,5 +1,7 @@ include(../spectrum.pri) +static: error(This application cannot be statically linked to the fftreal library) + TEMPLATE = app TARGET = spectrum -- cgit v0.12