diff options
| author | axis <qt-info@nokia.com> | 2009-05-18 14:25:08 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-18 14:25:08 +0200 |
| commit | 6e81bfbaf69864a06240835e0b30cdc47a2668b7 (patch) | |
| tree | aff37bf74549836696d420477e57f51969e97091 /demos/demos.pro | |
| parent | 3e5abb158c1924e555dc4142c4be89adc517b8c1 (diff) | |
| parent | 7008bfe80e0466ed2978b39e7e698bbd52fb690f (diff) | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
Diffstat (limited to 'demos/demos.pro')
| -rw-r--r-- | demos/demos.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index 1c98b9e6a5..3856591618 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -35,7 +35,7 @@ contains(QT_BUILD_PARTS, tools):{ wince*: SUBDIRS += demos_sqlbrowser } } -contains(QT_CONFIG, phonon)!static:SUBDIRS += demos_mediaplayer +contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):SUBDIRS += demos_browser # install |