diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-04 16:24:25 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-04 16:24:25 +1000 |
| commit | 49e7e1dccf38a8cf1aad88de037e590f7918b7ea (patch) | |
| tree | bc59a4d347d3f724341d559cb7bdef6d25e627a5 /src/src.pro | |
| parent | 57d68b06c15f8426c25e357f97b9154056969e0f (diff) | |
| parent | 2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4 (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/src.pro
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index 7bb731e63e..8c21ef7363 100644 --- a/src/src.pro +++ b/src/src.pro @@ -121,8 +121,6 @@ src_declarative.target = sub-declarative src_phonon.depends += src_dbus } contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): src_plugins.depends += src_opengl - contains(QT_CONFIG, declarative): src_multimedia.depends += src_declarative - contains(QT_CONFIG, multimedia): src_imports += src_multimedia } !symbian { |