diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-17 20:00:03 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-17 20:00:03 +0200 |
| commit | 91a1f7a1c408052b1d284d6b901819964e338fe5 (patch) | |
| tree | df7103f0ea0cb9d98f4b641d72c0f8b0ebdf2498 /demos/demos.pro | |
| parent | 94a3356d5eb7b255d439efe2699bf3a9b025e8eb (diff) | |
| parent | 509ef11ab4ba6165c16d9d311c4a1bf7cdfd2528 (diff) | |
| download | qt4-tools-91a1f7a1c408052b1d284d6b901819964e338fe5.tar.gz | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
Diffstat (limited to 'demos/demos.pro')
| -rw-r--r-- | demos/demos.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index 5e8a4ea538..b174135c45 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -59,6 +59,7 @@ contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser contains(QT_CONFIG, multimedia):SUBDIRS += demos_multimedia contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative +contains(QT_CONFIG, multimedia):SUBDIRS += demos_spectrum # install sources.files = README *.pro @@ -96,6 +97,7 @@ demos_browser.subdir = browser demos_boxes.subdir = boxes demos_sub-attaq.subdir = sub-attaq +demos_spectrum.subdir = spectrum #CONFIG += ordered !ordered { |