diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-18 14:01:45 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-18 14:01:45 (GMT) |
| commit | 5acc455fbadb476372eff9d4d0be1e4078e51193 (patch) | |
| tree | a44db8d76eb0138da6de62834004b222c6760397 | |
| parent | 181dc3984ddf1445d85d085f82c7d14f2fc08519 (diff) | |
| parent | 9d984a25f7433aeff0b2a5976bce7341796a701e (diff) | |
| download | Qt-5acc455fbadb476372eff9d4d0be1e4078e51193.zip Qt-5acc455fbadb476372eff9d4d0be1e4078e51193.tar.gz Qt-5acc455fbadb476372eff9d4d0be1e4078e51193.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/src.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 667df9c..3e63e6e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -31,11 +31,12 @@ contains(QT_CONFIG, webkit) { #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore SRC_SUBDIRS += src_webkit } -contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools SRC_SUBDIRS += src_plugins } +contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon + src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main src_s60main.target = sub-s60main src_winmain.subdir = $$QT_SOURCE_TREE/src/winmain |