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>
This commit is contained in:
Casper van Donderen
committed by
Qt by Nokia
Qt by Nokia
parent
d5e75a3a49
commit
ca4607979a
@@ -1,2 +0,0 @@
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS += spectrum
|
||||
@@ -2,33 +2,6 @@
|
||||
The example launcher provided with Qt can be used to explore each of the
|
||||
examples in this directory.
|
||||
|
||||
|
||||
Documentation for these examples can be found via the Tutorial and Examples
|
||||
link in the main Qt documentation.
|
||||
|
||||
|
||||
Finding the Qt Examples and Demos launcher
|
||||
==========================================
|
||||
|
||||
On Windows:
|
||||
|
||||
The launcher can be accessed via the Windows Start menu. Select the menu
|
||||
entry entitled "Qt Examples and Demos" entry in the submenu containing
|
||||
the Qt tools.
|
||||
|
||||
On Mac OS X:
|
||||
|
||||
For the binary distribution, the qtdemo executable is installed in the
|
||||
/Developer/Applications/Qt directory. For the source distribution, it is
|
||||
installed alongside the other Qt tools on the path specified when Qt is
|
||||
configured.
|
||||
|
||||
On Unix/Linux:
|
||||
|
||||
The qtdemo executable is installed alongside the other Qt tools on the path
|
||||
specified when Qt is configured.
|
||||
|
||||
On all platforms:
|
||||
|
||||
The source code for the launcher can be found in the demos/qtdemo directory
|
||||
in the Qt package. This example is built at the same time as the Qt libraries,
|
||||
tools, examples, and demonstrations.
|
||||
|
||||
@@ -47,6 +47,6 @@ macx {
|
||||
|
||||
sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt
|
||||
sources.files += bwins/fftreal.def eabi/fftreal.def
|
||||
sources.path = $$[QT_INSTALL_DEMOS]/qtmultimedia/spectrum/3rdparty/fftreal
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/spectrum/3rdparty/fftreal
|
||||
INSTALLS += sources
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
Spectrum analyser demo app
|
||||
Spectrum analyser app
|
||||
==========================
|
||||
|
||||
Introduction
|
||||
------------
|
||||
|
||||
This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window.
|
||||
This application is an example which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window.
|
||||
|
||||
|
||||
Acknowledgments
|
||||
@@ -74,9 +74,9 @@ symbian {
|
||||
# Install
|
||||
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro
|
||||
sources.path = $$[QT_INSTALL_DEMOS]/qtmultimedia/spectrum/app
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/spectrum/app
|
||||
images.files += images/record.png images/settings.png
|
||||
images.path = $$[QT_INSTALL_DEMOS]/qtmultimedia/spectrum/app/images
|
||||
images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/spectrum/app/images
|
||||
INSTALLS += sources images
|
||||
|
||||
# Deployment
|
||||
|
Before Width: | Height: | Size: 670 B After Width: | Height: | Size: 670 B |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
@@ -16,13 +16,13 @@ TARGET = spectrum
|
||||
symbian {
|
||||
# Create a 'make sis' rule which can be run from the top-level
|
||||
|
||||
CONFIG += qt_demo
|
||||
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_DEMOS]/qtmultimedia/spectrum
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/spectrum
|
||||
INSTALLS += sources
|
||||
|
||||
@@ -3,14 +3,6 @@ TEMPLATE = subdirs
|
||||
module_qtmultimedia_src.subdir = src
|
||||
module_qtmultimedia_src.target = module-qtmultimedia-src
|
||||
|
||||
module_qtmultimedia_demos.subdir = demos
|
||||
module_qtmultimedia_demos.target = module-qtmultimedia-demos
|
||||
module_qtmultimedia_demos.depends = module_qtmultimedia_src
|
||||
!contains(QT_BUILD_PARTS,demos) {
|
||||
module_multimedia_demos.CONFIG += no_default_install no_default_target
|
||||
}
|
||||
|
||||
|
||||
module_qtmultimedia_examples.subdir = examples
|
||||
module_qtmultimedia_examples.target = module-qtmultimedia-examples
|
||||
module_qtmultimedia_examples.depends = module_qtmultimedia_src
|
||||
@@ -26,6 +18,5 @@ module_qtmultimedia_tests.CONFIG = no_default_install
|
||||
!contains(QT_BUILD_PARTS,tests):module_qtmultimedia_tests.CONFIG += no_default_target
|
||||
|
||||
SUBDIRS += module_qtmultimedia_src \
|
||||
module_qtmultimedia_demos \
|
||||
module_qtmultimedia_examples \
|
||||
module_qtmultimedia_tests \
|
||||
|
||||
Reference in New Issue
Block a user