diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-05-20 13:39:59 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-05-20 13:52:06 (GMT) |
| commit | fafba0367c7998ddbd66f3c2941f9313eb06435c (patch) | |
| tree | e11587949fcdde08d93eb51f470cbf4f249f546d /src/src.pro | |
| parent | 91e041fcff000024e619de5d7561ce141cb99d99 (diff) | |
| download | Qt-fafba0367c7998ddbd66f3c2941f9313eb06435c.zip Qt-fafba0367c7998ddbd66f3c2941f9313eb06435c.tar.gz Qt-fafba0367c7998ddbd66f3c2941f9313eb06435c.tar.bz2 | |
Fix building on other platforms.
The order of things in SRC_SUBDIRS is important here because src_phonon
should be built before src_webkit and src_plugins because those
projects might link against Phonon. This should be fixed properly when
we merge into 4.6 because Phonon might depend on OpenGL for rendering
to a texture hence the comment.
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index 3e63e6e..f131e4f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -23,6 +23,9 @@ win32:{ !wince*: SRC_SUBDIRS += src_tools_idc } +# TODO the following line should be between opengl and webkit when the 'symbian' block is removed +contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon + !symbian { contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns @@ -35,8 +38,6 @@ 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 |