summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEckhart Koppen <eckhart.koppen@nokia.com>2011-01-19 05:33:26 (GMT)
committerEckhart Koppen <eckhart.koppen@nokia.com>2011-01-19 05:33:26 (GMT)
commitf9eedb80f131bd707965f859108fdc140f42946e (patch)
tree3b1e32e92e5a2ae89b75e847eb99c728319a480c
parentc9be4ccfbd63323a2d70d341c9bc490a95195148 (diff)
parentff0b4101f73f3e0cba47c0a39d65740decbd4307 (diff)
downloadQt-f9eedb80f131bd707965f859108fdc140f42946e.zip
Qt-f9eedb80f131bd707965f859108fdc140f42946e.tar.gz
Qt-f9eedb80f131bd707965f859108fdc140f42946e.tar.bz2
Merge remote branch 'qt-releng-review/master'
-rw-r--r--src/s60installs/bwins/QtCoreu.def5
-rw-r--r--src/s60installs/eabi/QtCoreu.def3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def
index f2c43e6..a2692f7 100644
--- a/src/s60installs/bwins/QtCoreu.def
+++ b/src/s60installs/bwins/QtCoreu.def
@@ -4598,4 +4598,9 @@ EXPORTS
?open@QFile@@QAE_NABVRFile@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4597 NONAME ; bool QFile::open(class RFile const &, class QFlags<enum QIODevice::OpenModeFlag>, class QFlags<enum QFile::FileHandleFlag>)
?open@QFile@@QAE_NHV?$QFlags@W4OpenModeFlag@QIODevice@@@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4598 NONAME ; bool QFile::open(int, class QFlags<enum QIODevice::OpenModeFlag>, class QFlags<enum QFile::FileHandleFlag>)
?open@QFile@@QAE_NPAU__sFILE@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4599 NONAME ; bool QFile::open(struct __sFILE *, class QFlags<enum QIODevice::OpenModeFlag>, class QFlags<enum QFile::FileHandleFlag>)
+ ?symbianCommandLine@QCoreApplicationPrivate@@SAPAVCApaCommandLine@@XZ @ 4600 NONAME ; class CApaCommandLine * QCoreApplicationPrivate::symbianCommandLine(void)
+ ?nsecsElapsed@QElapsedTimer@@QBE_JXZ @ 4601 NONAME ; long long QElapsedTimer::nsecsElapsed(void) const
+ ??XQPoint@@QAEAAV0@N@Z @ 4602 NONAME ; class QPoint & QPoint::operator*=(double)
+ ??XQPoint@@QAEAAV0@H@Z @ 4603 NONAME ; class QPoint & QPoint::operator*=(int)
+ ?hasError@QXmlStreamWriter@@QBE_NXZ @ 4604 NONAME ; bool QXmlStreamWriter::hasError(void) const
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index e97ac61..0488d0c 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3801,4 +3801,7 @@ EXPORTS
_ZN5QFile4openEP7__sFILE6QFlagsIN9QIODevice12OpenModeFlagEES2_INS_14FileHandleFlagEE @ 3800 NONAME
_ZN5QFile4openERK5RFile6QFlagsIN9QIODevice12OpenModeFlagEES3_INS_14FileHandleFlagEE @ 3801 NONAME
_ZN5QFile4openEi6QFlagsIN9QIODevice12OpenModeFlagEES0_INS_14FileHandleFlagEE @ 3802 NONAME
+ _ZN23QCoreApplicationPrivate18symbianCommandLineEv @ 3803 NONAME
+ _ZNK16QXmlStreamWriter8hasErrorEv @ 3804 NONAME
+ _ZNK13QElapsedTimer12nsecsElapsedEv @ 3805 NONAME