diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-08-12 13:48:08 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-08-12 13:48:08 (GMT) |
| commit | 4cd7180ad3365c0e8eef8a22c825f3289a799ab0 (patch) | |
| tree | e383d24055eb86e8b128d20517f5a0e0529eea8a /src/s60installs/qt.iby | |
| parent | 1e08ccc646e4f07fd560c901ff7b56626ed98d1e (diff) | |
| parent | 3368eea602d394812283d437b5e9d786e1af64e3 (diff) | |
| download | Qt-4cd7180ad3365c0e8eef8a22c825f3289a799ab0.zip Qt-4cd7180ad3365c0e8eef8a22c825f3289a799ab0.tar.gz Qt-4cd7180ad3365c0e8eef8a22c825f3289a799ab0.tar.bz2 | |
Merge branch 'master' into topic/mmfphonon
Conflicts:
src/3rdparty/phonon/phonon/factory.cpp
src/s60installs/qt_libs.pro
Diffstat (limited to 'src/s60installs/qt.iby')
| -rw-r--r-- | src/s60installs/qt.iby | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby index c76f4c9..3a7f008 100644 --- a/src/s60installs/qt.iby +++ b/src/s60installs/qt.iby @@ -5,7 +5,7 @@ // Dependancies for more than one module #include <base.iby> -#include <openenv.iby> // QtCore, QtGui, QtNetwork, QtOpenGL, QSvgIconEngine, +#include <openenv.iby> // QtCore, QtGui, QtNetwork, QtOpenGL, QSvgIconEngine, #include <cone.iby> // QtGui, QtOpenGL #include <stdcpp.iby> // for std C++ support |