Corrected headers for spectrum analyzer demo

- Added /3rdparty/ to directory path for FFTReal code
- Added missing $QT_BEGIN_LICENSE$, $QT_END_LICENSE$
- Fixed incorrect license in app/wavfile.cpp

Reviewed-by: trustme

72 files changed, 44 insertions, 14 deletions

diff --git a/demos/spectrum/fftreal/Array.h b/demos/spectrum/3rdparty/fftreal/Array.h
index a08e3cf2d3..a08e3cf2d3 100644
--- a/demos/spectrum/fftreal/Array.h
+++ b/demos/spectrum/3rdparty/fftreal/Array.h
diff --git a/demos/spectrum/fftreal/Array.hpp b/demos/spectrum/3rdparty/fftreal/Array.hpp
index 8300077e42..8300077e42 100644
--- a/demos/spectrum/fftreal/Array.hpp
+++ b/demos/spectrum/3rdparty/fftreal/Array.hpp
diff --git a/demos/spectrum/fftreal/DynArray.h b/demos/spectrum/3rdparty/fftreal/DynArray.h
index 8041a0c152..8041a0c152 100644
--- a/demos/spectrum/fftreal/DynArray.h
+++ b/demos/spectrum/3rdparty/fftreal/DynArray.h
diff --git a/demos/spectrum/fftreal/DynArray.hpp b/demos/spectrum/3rdparty/fftreal/DynArray.hpp
index e62b10f884..e62b10f884 100644
--- a/demos/spectrum/fftreal/DynArray.hpp
+++ b/demos/spectrum/3rdparty/fftreal/DynArray.hpp
diff --git a/demos/spectrum/fftreal/FFTReal.dsp b/demos/spectrum/3rdparty/fftreal/FFTReal.dsp
index fe970db086..fe970db086 100644
--- a/demos/spectrum/fftreal/FFTReal.dsp
+++ b/demos/spectrum/3rdparty/fftreal/FFTReal.dsp
diff --git a/demos/spectrum/fftreal/FFTReal.dsw b/demos/spectrum/3rdparty/fftreal/FFTReal.dsw
index 076b0aeb83..076b0aeb83 100644
--- a/demos/spectrum/fftreal/FFTReal.dsw
+++ b/demos/spectrum/3rdparty/fftreal/FFTReal.dsw
diff --git a/demos/spectrum/fftreal/FFTReal.h b/demos/spectrum/3rdparty/fftreal/FFTReal.h
index 9fb2725032..9fb2725032 100644
--- a/demos/spectrum/fftreal/FFTReal.h
+++ b/demos/spectrum/3rdparty/fftreal/FFTReal.h
diff --git a/demos/spectrum/fftreal/FFTReal.hpp b/demos/spectrum/3rdparty/fftreal/FFTReal.hpp
index 335d771dc3..335d771dc3 100644
--- a/demos/spectrum/fftreal/FFTReal.hpp
+++ b/demos/spectrum/3rdparty/fftreal/FFTReal.hpp
diff --git a/demos/spectrum/fftreal/FFTRealFixLen.h b/demos/spectrum/3rdparty/fftreal/FFTRealFixLen.h
index 0b80266882..0b80266882 100644
--- a/demos/spectrum/fftreal/FFTRealFixLen.h
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealFixLen.h
diff --git a/demos/spectrum/fftreal/FFTRealFixLen.hpp b/demos/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
index 6defb0095b..6defb0095b 100644
--- a/demos/spectrum/fftreal/FFTRealFixLen.hpp
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
diff --git a/demos/spectrum/fftreal/FFTRealFixLenParam.h b/demos/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
index 163c083239..163c083239 100644
--- a/demos/spectrum/fftreal/FFTRealFixLenParam.h
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
diff --git a/demos/spectrum/fftreal/FFTRealPassDirect.h b/demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
index 7d19c02e4e..7d19c02e4e 100644
--- a/demos/spectrum/fftreal/FFTRealPassDirect.h
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
diff --git a/demos/spectrum/fftreal/FFTRealPassDirect.hpp b/demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
index db9d568e61..db9d568e61 100644
--- a/demos/spectrum/fftreal/FFTRealPassDirect.hpp
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
diff --git a/demos/spectrum/fftreal/FFTRealPassInverse.h b/demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
index 2de895273b..2de895273b 100644
--- a/demos/spectrum/fftreal/FFTRealPassInverse.h
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
diff --git a/demos/spectrum/fftreal/FFTRealPassInverse.hpp b/demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
index 5737546967..5737546967 100644
--- a/demos/spectrum/fftreal/FFTRealPassInverse.hpp
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
diff --git a/demos/spectrum/fftreal/FFTRealSelect.h b/demos/spectrum/3rdparty/fftreal/FFTRealSelect.h
index bd722d4d19..bd722d4d19 100644
--- a/demos/spectrum/fftreal/FFTRealSelect.h
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealSelect.h
diff --git a/demos/spectrum/fftreal/FFTRealSelect.hpp b/demos/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
index 9ddf5864ca..9ddf5864ca 100644
--- a/demos/spectrum/fftreal/FFTRealSelect.hpp
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
diff --git a/demos/spectrum/fftreal/FFTRealUseTrigo.h b/demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
index c4368ee089..c4368ee089 100644
--- a/demos/spectrum/fftreal/FFTRealUseTrigo.h
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
diff --git a/demos/spectrum/fftreal/FFTRealUseTrigo.hpp b/demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
index aa968b81a3..aa968b81a3 100644
--- a/demos/spectrum/fftreal/FFTRealUseTrigo.hpp
+++ b/demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
diff --git a/demos/spectrum/fftreal/OscSinCos.h b/demos/spectrum/3rdparty/fftreal/OscSinCos.h
index 775fc14f32..775fc14f32 100644
--- a/demos/spectrum/fftreal/OscSinCos.h
+++ b/demos/spectrum/3rdparty/fftreal/OscSinCos.h
diff --git a/demos/spectrum/fftreal/OscSinCos.hpp b/demos/spectrum/3rdparty/fftreal/OscSinCos.hpp
index 749aef04d2..749aef04d2 100644
--- a/demos/spectrum/fftreal/OscSinCos.hpp
+++ b/demos/spectrum/3rdparty/fftreal/OscSinCos.hpp
diff --git a/demos/spectrum/fftreal/TestAccuracy.h b/demos/spectrum/3rdparty/fftreal/TestAccuracy.h
index 4b07a6b605..4b07a6b605 100644
--- a/demos/spectrum/fftreal/TestAccuracy.h
+++ b/demos/spectrum/3rdparty/fftreal/TestAccuracy.h
diff --git a/demos/spectrum/fftreal/TestAccuracy.hpp b/demos/spectrum/3rdparty/fftreal/TestAccuracy.hpp
index 5c794f747b..5c794f747b 100644
--- a/demos/spectrum/fftreal/TestAccuracy.hpp
+++ b/demos/spectrum/3rdparty/fftreal/TestAccuracy.hpp
diff --git a/demos/spectrum/fftreal/TestHelperFixLen.h b/demos/spectrum/3rdparty/fftreal/TestHelperFixLen.h
index ecff96d33b..ecff96d33b 100644
--- a/demos/spectrum/fftreal/TestHelperFixLen.h
+++ b/demos/spectrum/3rdparty/fftreal/TestHelperFixLen.h
diff --git a/demos/spectrum/fftreal/TestHelperFixLen.hpp b/demos/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
index 25048b9197..25048b9197 100644
--- a/demos/spectrum/fftreal/TestHelperFixLen.hpp
+++ b/demos/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
diff --git a/demos/spectrum/fftreal/TestHelperNormal.h b/demos/spectrum/3rdparty/fftreal/TestHelperNormal.h
index a7bff5c2e0..a7bff5c2e0 100644
--- a/demos/spectrum/fftreal/TestHelperNormal.h
+++ b/demos/spectrum/3rdparty/fftreal/TestHelperNormal.h
diff --git a/demos/spectrum/fftreal/TestHelperNormal.hpp b/demos/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
index e037696aec..e037696aec 100644
--- a/demos/spectrum/fftreal/TestHelperNormal.hpp
+++ b/demos/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
diff --git a/demos/spectrum/fftreal/TestSpeed.h b/demos/spectrum/3rdparty/fftreal/TestSpeed.h
index 2295781826..2295781826 100644
--- a/demos/spectrum/fftreal/TestSpeed.h
+++ b/demos/spectrum/3rdparty/fftreal/TestSpeed.h
diff --git a/demos/spectrum/fftreal/TestSpeed.hpp b/demos/spectrum/3rdparty/fftreal/TestSpeed.hpp
index e716b2a76e..e716b2a76e 100644
--- a/demos/spectrum/fftreal/TestSpeed.hpp
+++ b/demos/spectrum/3rdparty/fftreal/TestSpeed.hpp
diff --git a/demos/spectrum/fftreal/TestWhiteNoiseGen.h b/demos/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
index d815f8e315..d815f8e315 100644
--- a/demos/spectrum/fftreal/TestWhiteNoiseGen.h
+++ b/demos/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
diff --git a/demos/spectrum/fftreal/TestWhiteNoiseGen.hpp b/demos/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
index 13b7eb3e0d..13b7eb3e0d 100644
--- a/demos/spectrum/fftreal/TestWhiteNoiseGen.hpp
+++ b/demos/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
diff --git a/demos/spectrum/fftreal/bwins/fftrealu.def b/demos/spectrum/3rdparty/fftreal/bwins/fftrealu.def
index 7a79397735..7a79397735 100644
--- a/demos/spectrum/fftreal/bwins/fftrealu.def
+++ b/demos/spectrum/3rdparty/fftreal/bwins/fftrealu.def
diff --git a/demos/spectrum/fftreal/def.h b/demos/spectrum/3rdparty/fftreal/def.h
index 99c545f531..99c545f531 100644
--- a/demos/spectrum/fftreal/def.h
+++ b/demos/spectrum/3rdparty/fftreal/def.h
diff --git a/demos/spectrum/fftreal/eabi/fftrealu.def b/demos/spectrum/3rdparty/fftreal/eabi/fftrealu.def
index f95a44140d..f95a44140d 100644
--- a/demos/spectrum/fftreal/eabi/fftrealu.def
+++ b/demos/spectrum/3rdparty/fftreal/eabi/fftrealu.def
diff --git a/demos/spectrum/fftreal/fftreal.pas b/demos/spectrum/3rdparty/fftreal/fftreal.pas
index ea6375450e..ea6375450e 100644
--- a/demos/spectrum/fftreal/fftreal.pas
+++ b/demos/spectrum/3rdparty/fftreal/fftreal.pas
diff --git a/demos/spectrum/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro
index 786a962218..4ab965297d 100644
--- a/demos/spectrum/fftreal/fftreal.pro
+++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro
@@ -34,7 +34,7 @@ symbian {
     macx {
         CONFIG += lib_bundle
     } else {
-        DESTDIR = ../bin
+        DESTDIR = ../../bin
     }
 } 
 
diff --git a/demos/spectrum/fftreal/fftreal_wrapper.cpp b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
index 50ab36d352..50ab36d352 100644
--- a/demos/spectrum/fftreal/fftreal_wrapper.cpp
+++ b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
diff --git a/demos/spectrum/fftreal/fftreal_wrapper.h b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
index 48d614eb06..48d614eb06 100644
--- a/demos/spectrum/fftreal/fftreal_wrapper.h
+++ b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
diff --git a/demos/spectrum/fftreal/license.txt b/demos/spectrum/3rdparty/fftreal/license.txt
index 918fe68ea3..918fe68ea3 100644
--- a/demos/spectrum/fftreal/license.txt
+++ b/demos/spectrum/3rdparty/fftreal/license.txt
diff --git a/demos/spectrum/fftreal/readme.txt b/demos/spectrum/3rdparty/fftreal/readme.txt
index 0c5ce162fe..0c5ce162fe 100644
--- a/demos/spectrum/fftreal/readme.txt
+++ b/demos/spectrum/3rdparty/fftreal/readme.txt
diff --git a/demos/spectrum/fftreal/stopwatch/ClockCycleCounter.cpp b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
index fe1d4245f4..fe1d4245f4 100644
--- a/demos/spectrum/fftreal/stopwatch/ClockCycleCounter.cpp
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
diff --git a/demos/spectrum/fftreal/stopwatch/ClockCycleCounter.h b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h
index ba7a99a46b..ba7a99a46b 100644
--- a/demos/spectrum/fftreal/stopwatch/ClockCycleCounter.h
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h
diff --git a/demos/spectrum/fftreal/stopwatch/ClockCycleCounter.hpp b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp
index fbd511e259..fbd511e259 100644
--- a/demos/spectrum/fftreal/stopwatch/ClockCycleCounter.hpp
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp
diff --git a/demos/spectrum/fftreal/stopwatch/Int64.h b/demos/spectrum/3rdparty/fftreal/stopwatch/Int64.h
index 1e786e255e..1e786e255e 100644
--- a/demos/spectrum/fftreal/stopwatch/Int64.h
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/Int64.h
diff --git a/demos/spectrum/fftreal/stopwatch/StopWatch.cpp b/demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp
index 7795d86d65..7795d86d65 100644
--- a/demos/spectrum/fftreal/stopwatch/StopWatch.cpp
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp
diff --git a/demos/spectrum/fftreal/stopwatch/StopWatch.h b/demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h
index 9cc47e5f20..9cc47e5f20 100644
--- a/demos/spectrum/fftreal/stopwatch/StopWatch.h
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h
diff --git a/demos/spectrum/fftreal/stopwatch/StopWatch.hpp b/demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp
index 74482a7a72..74482a7a72 100644
--- a/demos/spectrum/fftreal/stopwatch/StopWatch.hpp
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp
diff --git a/demos/spectrum/fftreal/stopwatch/def.h b/demos/spectrum/3rdparty/fftreal/stopwatch/def.h
index 81ee6aaa38..81ee6aaa38 100644
--- a/demos/spectrum/fftreal/stopwatch/def.h
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/def.h
diff --git a/demos/spectrum/fftreal/stopwatch/fnc.h b/demos/spectrum/3rdparty/fftreal/stopwatch/fnc.h
index 055453543b..055453543b 100644
--- a/demos/spectrum/fftreal/stopwatch/fnc.h
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/fnc.h
diff --git a/demos/spectrum/fftreal/stopwatch/fnc.hpp b/demos/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp
index 0ab5949efe..0ab5949efe 100644
--- a/demos/spectrum/fftreal/stopwatch/fnc.hpp
+++ b/demos/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp
diff --git a/demos/spectrum/fftreal/test.cpp b/demos/spectrum/3rdparty/fftreal/test.cpp
index 7b6ed2cab9..7b6ed2cab9 100644
--- a/demos/spectrum/fftreal/test.cpp
+++ b/demos/spectrum/3rdparty/fftreal/test.cpp
diff --git a/demos/spectrum/fftreal/test_fnc.h b/demos/spectrum/3rdparty/fftreal/test_fnc.h
index 2622156641..2622156641 100644
--- a/demos/spectrum/fftreal/test_fnc.h
+++ b/demos/spectrum/3rdparty/fftreal/test_fnc.h
diff --git a/demos/spectrum/fftreal/test_fnc.hpp b/demos/spectrum/3rdparty/fftreal/test_fnc.hpp
index 4b5f9f59e8..4b5f9f59e8 100644
--- a/demos/spectrum/fftreal/test_fnc.hpp
+++ b/demos/spectrum/3rdparty/fftreal/test_fnc.hpp
diff --git a/demos/spectrum/fftreal/test_settings.h b/demos/spectrum/3rdparty/fftreal/test_settings.h
index b893afc8db..b893afc8db 100644
--- a/demos/spectrum/fftreal/test_settings.h
+++ b/demos/spectrum/3rdparty/fftreal/test_settings.h
diff --git a/demos/spectrum/fftreal/testapp.dpr b/demos/spectrum/3rdparty/fftreal/testapp.dpr
index 54f2eb99a1..54f2eb99a1 100644
--- a/demos/spectrum/fftreal/testapp.dpr
+++ b/demos/spectrum/3rdparty/fftreal/testapp.dpr
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro
index 9964d14299..2adb605404 100644
--- a/demos/spectrum/app/app.pro
+++ b/demos/spectrum/app/app.pro
@@ -37,7 +37,9 @@ HEADERS  += engine.h \
             waveform.h \
             wavfile.h
 
-INCLUDEPATH += ../fftreal
+fftreal_dir = ../3rdparty/fftreal
+
+INCLUDEPATH += $${fftreal_dir}
 
 RESOURCES = spectrum.qrc
 
@@ -58,7 +60,7 @@ symbian {
     } else {
         macx {
             # Link to fftreal framework
-            LIBS += -F../fftreal
+            LIBS += -F$${fftreal_dir}
             LIBS += -framework fftreal
         } else {
             # Link to dynamic library which is written to ../bin
@@ -92,7 +94,7 @@ symbian {
             QMAKE_POST_LINK = \
                 mkdir -p $${framework_dir} &&\
                 rm -rf $${framework_dir}/fftreal.framework &&\
-                cp -R ../fftreal/fftreal.framework $${framework_dir} &&\
+                cp -R $${fftreal_dir}/fftreal.framework $${framework_dir} &&\
                 install_name_tool -id @executable_path/../Frameworks/$${framework_name} \
                                   $${framework_dir}/$${framework_name} &&\
                 install_name_tool -change $${framework_name} \
diff --git a/demos/spectrum/app/engine.h b/demos/spectrum/app/engine.h
index 7028247413..16088b2e80 100644
--- a/demos/spectrum/app/engine.h
+++ b/demos/spectrum/app/engine.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/frequencyspectrum.h b/demos/spectrum/app/frequencyspectrum.h
index 610ed6eb91..0dd814edaf 100644
--- a/demos/spectrum/app/frequencyspectrum.h
+++ b/demos/spectrum/app/frequencyspectrum.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/levelmeter.h b/demos/spectrum/app/levelmeter.h
index 7d4238dc86..ab8340be80 100644
--- a/demos/spectrum/app/levelmeter.h
+++ b/demos/spectrum/app/levelmeter.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/mainwidget.h b/demos/spectrum/app/mainwidget.h
index 8e24f4a557..846b97ac5b 100644
--- a/demos/spectrum/app/mainwidget.h
+++ b/demos/spectrum/app/mainwidget.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/progressbar.h b/demos/spectrum/app/progressbar.h
index 8dc476502b..de9e5a93c7 100644
--- a/demos/spectrum/app/progressbar.h
+++ b/demos/spectrum/app/progressbar.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/settingsdialog.h b/demos/spectrum/app/settingsdialog.h
index 5f613c09b5..7215a50e03 100644
--- a/demos/spectrum/app/settingsdialog.h
+++ b/demos/spectrum/app/settingsdialog.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/spectrograph.h b/demos/spectrum/app/spectrograph.h
index 837a1a5f81..6bfef3304a 100644
--- a/demos/spectrum/app/spectrograph.h
+++ b/demos/spectrum/app/spectrograph.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/spectrum.h b/demos/spectrum/app/spectrum.h
index 47b88ae21f..6cfe29fd1d 100644
--- a/demos/spectrum/app/spectrum.h
+++ b/demos/spectrum/app/spectrum.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/spectrumanalyser.h b/demos/spectrum/app/spectrumanalyser.h
index 9d7684a093..caeb1c1e95 100644
--- a/demos/spectrum/app/spectrumanalyser.h
+++ b/demos/spectrum/app/spectrumanalyser.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/tonegenerator.h b/demos/spectrum/app/tonegenerator.h
index 05d4c17642..419f7e413b 100644
--- a/demos/spectrum/app/tonegenerator.h
+++ b/demos/spectrum/app/tonegenerator.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/tonegeneratordialog.h b/demos/spectrum/app/tonegeneratordialog.h
index 33b608d1a1..35d69c2350 100644
--- a/demos/spectrum/app/tonegeneratordialog.h
+++ b/demos/spectrum/app/tonegeneratordialog.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/utils.h b/demos/spectrum/app/utils.h
index cfa36335f4..83467cd16c 100644
--- a/demos/spectrum/app/utils.h
+++ b/demos/spectrum/app/utils.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/waveform.h b/demos/spectrum/app/waveform.h
index e5cde5ca46..4de527f1d3 100644
--- a/demos/spectrum/app/waveform.h
+++ b/demos/spectrum/app/waveform.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/app/wavfile.cpp b/demos/spectrum/app/wavfile.cpp
index 163e5eedc2..ec911ad62a 100644
--- a/demos/spectrum/app/wavfile.cpp
+++ b/demos/spectrum/app/wavfile.cpp
@@ -1,31 +1,31 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This device is part of the test suite of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
-** This device contains pre-release code and may not be distributed.
-** You may use this device in accordance with the terms and conditions
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
 ** contained in the Technology Preview License Agreement accompanying
 ** this package.
 **
 ** GNU Lesser General Public License Usage
-** Alternatively, this device may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the device LICENSE.LGPL included in the
-** packaging of this device.  Please review the following information to
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the device LGPL_EXCEPTION.txt in this package.
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** If you have questions regarding the use of this device, please contact
+** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
 **
 **
diff --git a/demos/spectrum/app/wavfile.h b/demos/spectrum/app/wavfile.h
index d8c54fa9ed..05866f7255 100644
--- a/demos/spectrum/app/wavfile.h
+++ b/demos/spectrum/app/wavfile.h
@@ -6,6 +6,7 @@
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
 ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 ** POSSIBILITY OF SUCH DAMAGE.
+** $QT_END_LICENSE$
 **
 *****************************************************************************/
 
diff --git a/demos/spectrum/spectrum.pro b/demos/spectrum/spectrum.pro
index 823f61044f..86a75834f7 100644
--- a/demos/spectrum/spectrum.pro
+++ b/demos/spectrum/spectrum.pro
@@ -6,7 +6,7 @@ TEMPLATE = subdirs
 CONFIG  += ordered
 
 !contains(DEFINES, DISABLE_FFT) {
-    SUBDIRS += fftreal
+    SUBDIRS += 3rdparty/fftreal
 }
 
 SUBDIRS += app