Merge demos and examples.

Change-Id: I65ba412ef5207a71bf8763983b28672d1743f4b8 Reviewed-on: http://codereview.qt.nokia.com/1398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2011-07-11 09:56:57 +02:00
parent d5e75a3a49
commit ca4607979a
95 changed files with 8 additions and 46 deletions
--- a/examples/multimedia/spectrum/spectrum.pro
+++ b/examples/multimedia/spectrum/spectrum.pro
@@ -0,0 +1,28 @@
+include(spectrum.pri)
+
+TEMPLATE = subdirs
+
+# Ensure that library is built before application
+CONFIG  += ordered
+
+!contains(DEFINES, DISABLE_FFT) {
+    SUBDIRS += 3rdparty/fftreal
+}
+
+SUBDIRS += app
+
+TARGET = spectrum
+
+symbian {
+    # Create a 'make sis' rule which can be run from the top-level
+
+    CONFIG += qt_example
+
+    # UID for the SIS file
+    TARGET.UID3 = 0xA000E402
+}
+
+sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/spectrum
+INSTALLS += sources
+