summaryrefslogtreecommitdiffstats
path: root/src/s60installs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-09 00:21:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-09 00:21:06 (GMT)
commit3d2504305fa39903ab680d7199cb4bb5427167e8 (patch)
tree71166564d72a9ccfbfcf6356a994f6e8061834f9 /src/s60installs
parent198d903fa18d9f1d51615974d71de8236e97c2cd (diff)
parent1dab1be81c2f295736f196a9d56ce4facb59fe64 (diff)
downloadQt-3d2504305fa39903ab680d7199cb4bb5427167e8.zip
Qt-3d2504305fa39903ab680d7199cb4bb5427167e8.tar.gz
Qt-3d2504305fa39903ab680d7199cb4bb5427167e8.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed deployment for symbian/linux-armcc when using shadow builds. Started using qtmain.lib for all Qt applications, also corelib ones. Make qmake to pass all UTF-8 characters unchanged through parser. Implement support for DEPLOYMENT.display_name in Symbian Added .flags modifier support for DEPLOYMENT items in Symbian Make default application deployment removable Allow pkg_prerules and pkg_postrules to be targeted to separate files Added missing def file symbol. Revert "Use qtmain.lib to provide entry point for all Symbian applications" Fixed test after the fix to QT-4077. Fixed event starvation with pointer events on Symbian.
Diffstat (limited to 'src/s60installs')
-rw-r--r--src/s60installs/eabi/QtCoreu.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index eb53dca..aefbe1f 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3713,4 +3713,5 @@ EXPORTS
_ZrsR11QDataStreamR12QEasingCurve @ 3712 NONAME
_Z26qt_symbian_SetupThreadHeapiR24SStdEpocThreadCreateInfo @ 3713 NONAME
_ZN24QAbstractDeclarativeData17objectNameChangedE @ 3714 NONAME DATA 4
+ _ZN23QEventDispatcherSymbian36queueDeferredActiveObjectsCompletionEv @ 3715 NONAME