summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-08-12 10:55:29 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-08-12 11:09:31 (GMT)
commite83842f99c5c76faad4a4e85ea5cecb375da1c9c (patch)
tree95bd21fb3686665e4b0740f4718da78ae4278b56 /demos
parent072fb7b9b21e15e3dafe9064d2c93fc4658220fc (diff)
downloadQt-e83842f99c5c76faad4a4e85ea5cecb375da1c9c.zip
Qt-e83842f99c5c76faad4a4e85ea5cecb375da1c9c.tar.gz
Qt-e83842f99c5c76faad4a4e85ea5cecb375da1c9c.tar.bz2
Fixed build failure
Task-number: QTBUG-12713
Diffstat (limited to 'demos')
-rw-r--r--demos/spectrum/3rdparty/fftreal/fftreal.pro2
-rw-r--r--demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h4
-rw-r--r--demos/spectrum/app/app.pro2
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 <QtCore/QtGlobal>
-#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