From cb816126b378634defdfa9125ebf02087462f16c Mon Sep 17 00:00:00 2001 From: Pasi Pentikainen Date: Mon, 23 Apr 2012 16:28:32 +0300 Subject: Symbian: fix symbian deffiles Absent removed and freeze added exports caused by change If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 "Moved qmljs_debug_arguments to QCoreApplication" (commit 8599a0e6397391634ee52197e164f6b7121f9a4d). Change-Id: I6974d1f38c233b2143fe2e4e59b730b2bab475dc Reviewed-by: Murray Read Reviewed-by: Jaakko Helanti Reviewed-by: Shane Kearns --- src/s60installs/bwins/QtCoreu.def | 3 ++- src/s60installs/bwins/QtGuiu.def | 4 ++-- src/s60installs/eabi/QtCoreu.def | 2 ++ src/s60installs/eabi/QtGuiu.def | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def index d6058d66fd..43f1055011 100644 --- a/src/s60installs/bwins/QtCoreu.def +++ b/src/s60installs/bwins/QtCoreu.def @@ -4891,4 +4891,5 @@ EXPORTS ?activeObjectError@QEventDispatcherSymbian@@QAEXH@Z @ 4890 NONAME ; void QEventDispatcherSymbian::activeObjectError(int) ?timerFired@QEventDispatcherSymbian@@QAEXHPAVQTimerActiveObject@@@Z @ 4891 NONAME ; void QEventDispatcherSymbian::timerFired(int, class QTimerActiveObject *) ?wakeUpWasCalled@QEventDispatcherSymbian@@QAEXPAVQWakeUpActiveObject@@@Z @ 4892 NONAME ; void QEventDispatcherSymbian::wakeUpWasCalled(class QWakeUpActiveObject *) - + ?qmljsDebugArguments@QCoreApplicationPrivate@@SA?AVQString@@XZ @ 4893 NONAME ; class QString QCoreApplicationPrivate::qmljsDebugArguments(void) + ?processCommandLineArguments@QCoreApplicationPrivate@@QAEXXZ @ 4894 NONAME ; void QCoreApplicationPrivate::processCommandLineArguments(void) diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 650e983d49..5a6131b821 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12894,8 +12894,8 @@ EXPORTS ?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@PAVQGraphicsItem@@@Z @ 12893 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(class QGraphicsItem *) const ?maxTextureHeight@QTextureGlyphCache@@UBEHXZ @ 12894 NONAME ; int QTextureGlyphCache::maxTextureHeight(void) const ?maxTextureWidth@QTextureGlyphCache@@UBEHXZ @ 12895 NONAME ; int QTextureGlyphCache::maxTextureWidth(void) const - ?qmljs_debug_arguments@QApplicationPrivate@@2VQString@@A @ 12896 NONAME ; class QString QApplicationPrivate::qmljs_debug_arguments - ?qmljsDebugArgumentsString@QApplicationPrivate@@SA?AVQString@@XZ @ 12897 NONAME ; class QString QApplicationPrivate::qmljsDebugArgumentsString(void) + ?qmljs_debug_arguments@QApplicationPrivate@@2VQString@@A @ 12896 NONAME ABSENT ; class QString QApplicationPrivate::qmljs_debug_arguments + ?qmljsDebugArgumentsString@QApplicationPrivate@@SA?AVQString@@XZ @ 12897 NONAME ABSENT ; class QString QApplicationPrivate::qmljsDebugArgumentsString(void) ?convertToPostscriptFontFamilyName@QFontEngine@@SA?AVQByteArray@@ABV2@@Z @ 12898 NONAME ; class QByteArray QFontEngine::convertToPostscriptFontFamilyName(class QByteArray const &) ?lastResortFont@QFont@@QBE?AVQString@@XZ @ 12899 NONAME ; class QString QFont::lastResortFont(void) const ?setFontEngine@QStaticTextItem@@QAEXPAVQFontEngine@@@Z @ 12900 NONAME ; void QStaticTextItem::setFontEngine(class QFontEngine *) diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def index 7977492886..18b97e3ec8 100644 --- a/src/s60installs/eabi/QtCoreu.def +++ b/src/s60installs/eabi/QtCoreu.def @@ -4171,4 +4171,6 @@ EXPORTS _ZNK21QSymbianSocketManager17activeConnectionsEv @ 4170 NONAME _ZN23QEventDispatcherSymbian10timerFiredEiP18QTimerActiveObject @ 4171 NONAME _ZN23QEventDispatcherSymbian15wakeUpWasCalledEP19QWakeUpActiveObject @ 4172 NONAME + _ZN23QCoreApplicationPrivate19qmljsDebugArgumentsEv @ 4173 NONAME + _ZN23QCoreApplicationPrivate27processCommandLineArgumentsEv @ 4174 NONAME diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 1b9e453be6..0a7166456b 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12097,8 +12097,8 @@ EXPORTS _ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4 ABSENT _ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFP13QGraphicsItem @ 12097 NONAME _ZNK20QGraphicsItemPrivate21effectiveBoundingRectEP13QGraphicsItem @ 12098 NONAME - _ZN19QApplicationPrivate21qmljs_debug_argumentsE @ 12099 NONAME DATA 4 - _ZN19QApplicationPrivate25qmljsDebugArgumentsStringEv @ 12100 NONAME + _ZN19QApplicationPrivate21qmljs_debug_argumentsE @ 12099 NONAME DATA 4 ABSENT + _ZN19QApplicationPrivate25qmljsDebugArgumentsStringEv @ 12100 NONAME ABSENT _ZNK5QFont14lastResortFontEv @ 12101 NONAME _ZN11QFontEngine33convertToPostscriptFontFamilyNameERK10QByteArray @ 12102 NONAME _ZN15QStaticTextItem13setFontEngineEP11QFontEngine @ 12103 NONAME -- cgit v1.2.3