diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 05:20:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 05:20:09 (GMT) |
| commit | 072fb7b9b21e15e3dafe9064d2c93fc4658220fc (patch) | |
| tree | 6cfff620a05d8b17ee57c00c2a7042ed36663777 /demos | |
| parent | c68fc875a4f824686b1a55f5eb810ad72922e58a (diff) | |
| parent | 30318cd719255f782dcc1a0d948eea0054bdf737 (diff) | |
| download | Qt-072fb7b9b21e15e3dafe9064d2c93fc4658220fc.zip Qt-072fb7b9b21e15e3dafe9064d2c93fc4658220fc.tar.gz Qt-072fb7b9b21e15e3dafe9064d2c93fc4658220fc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added documentation for Spectrum Analyzer demo
Do not include Spectrum Analyzer demo in static builds
Gcce building support for symbian-sbsv2
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 |