diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-15 06:09:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-15 06:09:59 (GMT) |
| commit | a26ae9efb66adcd0f6253b363324c435f5510f6c (patch) | |
| tree | fb4c56662c1564d421f8dfc3c8465b1a68b34636 /config.profiles/symbian/qt.iby | |
| parent | 51872de548e1840431ef37f9172cb06f77875462 (diff) | |
| parent | 53e589563f4adc51983703e6119c762bd81f584b (diff) | |
| download | Qt-a26ae9efb66adcd0f6253b363324c435f5510f6c.zip Qt-a26ae9efb66adcd0f6253b363324c435f5510f6c.tar.gz Qt-a26ae9efb66adcd0f6253b363324c435f5510f6c.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (506 commits)
Removed timestamp setting and checking for Symbian header export
Cocoa/Alien: bugfix corner cases with popups and enter/leave
My 4.7.2 changes
Fix QFileDialog Symbian native file dialog filename filtering.
fix QMAKE_COPY_DIR for mingw+sh
Phonon MMF backend enabled in configuration and deployment
Using a better flag to control the fast allocator
Using QElapesedTimer for Symbian idle detector
Idle detector thread improvements
Updated QtGui and QtCore DEF files
Update tests for QScriptEngineAgent.
PathView items were not correctly updated when rootIndex changed.
Allow text to selected in a TextEdit or TextInput inside a Flickable.
Update modules-related tests and docs
CLeanup registers after AddString
4.7.2 changes
Change paging attributes for Symbian binaries
Fix build failure
Fix regression in creating mkspecs/default
Use the thread-default glib context for the DBus connection in the ICD bearer manager.
...
Diffstat (limited to 'config.profiles/symbian/qt.iby')
| -rw-r--r-- | config.profiles/symbian/qt.iby | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.profiles/symbian/qt.iby b/config.profiles/symbian/qt.iby index 2b3be0a..7431cfa 100644 --- a/config.profiles/symbian/qt.iby +++ b/config.profiles/symbian/qt.iby @@ -43,8 +43,8 @@ file=ABI_DIR\BUILD_DIR\qsvgicon.dll SHARED_LIB_DIR\qsvgicon.dll // This is commented out by default, as normally Helix backend will be used. // If the Helix backend is present, it will override MMF backend, so make sure to remove it from // image creation in addition to uncommenting the following lines if you want to use MMF backend. -//file=ABI_DIR\BUILD_DIR\phonon_mmf.dll SHARED_LIB_DIR\phonon_mmf.dll -//data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin +file=ABI_DIR\BUILD_DIR\phonon_mmf.dll SHARED_LIB_DIR\phonon_mmf.dll +data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin // QtMultimedia audio backend file=ABI_DIR\BUILD_DIR\qaudio.dll SHARED_LIB_DIR\qaudio.dll |