diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-08-10 09:51:06 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-08-11 13:12:44 (GMT) |
| commit | 32a54a21d77310f7bc1f306d175e41040d024a43 (patch) | |
| tree | ff1e7ecbe6114efbf69786c48f41d23d0c320663 /demos | |
| parent | bdfbedf971f3e9ef99977652308b9e2b1c213210 (diff) | |
| download | Qt-32a54a21d77310f7bc1f306d175e41040d024a43.zip Qt-32a54a21d77310f7bc1f306d175e41040d024a43.tar.gz Qt-32a54a21d77310f7bc1f306d175e41040d024a43.tar.bz2 | |
Do not include Spectrum Analyzer demo in static builds
This demo includes a 3rd party library which is licensed under
the LGPL. As such, the demo application may only link to the
library dynamically.
Task-number: QTBUG-12713
Reviewed-by: Justin McPherson
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/demos.pro | 2 | ||||
| -rw-r--r-- | demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index f359bd7..fdc1e4c 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -58,7 +58,7 @@ wince*:SUBDIRS += demos_sqlbrowser contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative -contains(QT_CONFIG, multimedia):SUBDIRS += demos_spectrum +contains(QT_CONFIG, multimedia):!static:SUBDIRS += demos_spectrum # install sources.files = README *.pro diff --git a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h index 48d614e..b8190a9 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h @@ -22,6 +22,10 @@ #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 |