summaryrefslogtreecommitdiffstats
path: root/src/s60installs/eabi/QtGuiu.def
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-03 02:52:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-03 02:52:17 (GMT)
commitdaeb81493aef4fd8f632ba4ea7f8d12ed80fa7be (patch)
tree7d10df975019f40c7c279d917ca45caa4fd14f92 /src/s60installs/eabi/QtGuiu.def
parent8c01157a9056f91d40d3579bfc0eb9b81a5f99d8 (diff)
parentcefb4a2e9056f390871cd01f733c2519fd15d308 (diff)
downloadQt-daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be.zip
Qt-daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be.tar.gz
Qt-daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be.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: Hide some more files from git-status. Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix. Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix. Fixed deployment locations for various profiles. Added a top-level runonphone target for Qt and QtWebKit. QS60Style: Simplify QMenu drawing QS60Style: Remove gap from QProgressDialog ColorDialog is incorrectly positioned Support for "deploy" make target in Symbian qtguiu.def merge conflict fix Fix for include "private/qt_s60_p.h" in non-symbian builds Making orbit input methods work with Qt apps with -no-s60 Using the remaining valid data to construct the QTime object when msec parsing failed. QProgressDialog text is too close to dialog border fix for broken input method loading Avkon Removal DEF file updates Stub version of QS60Style Avkon removal configured with -no-s60 QFileDialog broken in landscape in N8
Diffstat (limited to 'src/s60installs/eabi/QtGuiu.def')
-rw-r--r--src/s60installs/eabi/QtGuiu.def26
1 files changed, 25 insertions, 1 deletions
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 5b21b97..018cba2 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -5957,7 +5957,7 @@ EXPORTS
_ZN7QDialog16staticMetaObjectE @ 5956 NONAME DATA 16
_ZN7QDialog18setSizeGripEnabledEb @ 5957 NONAME
_ZN7QDialog19getStaticMetaObjectEv @ 5958 NONAME
- _ZN7QDialog19s60AdjustedPositionEv @ 5959 NONAME
+ _ZN7QDialog23symbianAdjustedPositionEv @ 5959 NONAME
_ZN7QDialog4doneEi @ 5960 NONAME
_ZN7QDialog4execEv @ 5961 NONAME
_ZN7QDialog4openEv @ 5962 NONAME
@@ -12060,4 +12060,28 @@ EXPORTS
_ZTV18QRuntimePixmapData @ 12059 NONAME
_ZN11QEglContext21swapBuffersRegion2NOKEiPK7QRegion @ 12060 NONAME
_ZN4QEgl24eglSwapBuffersRegion2NOKEiiiPKi @ 12061 NONAME
+ _ZN13QS60MainAppUi11HandleErrorEiRK14SExtendedErrorR6TDes16S4_ @ 12062 NONAME
+ _ZN13QS60MainAppUi13PrepareToExitEv @ 12063 NONAME
+ _ZN13QS60MainAppUi15MopSupplyObjectE8TTypeUid @ 12064 NONAME
+ _ZN13QS60MainAppUi15ProcessCommandLEi @ 12065 NONAME
+ _ZN13QS60MainAppUi18HandleSystemEventLERK8TWsEvent @ 12066 NONAME
+ _ZN13QS60MainAppUi19Reserved_MtsmObjectEv @ 12067 NONAME
+ _ZN13QS60MainAppUi21Reserved_MtsmPositionEv @ 12068 NONAME
+ _ZN13QS60MainAppUi22HandleForegroundEventLEi @ 12069 NONAME
+ _ZN13QS60MainAppUi22HandleViewDeactivationERK10TVwsViewIdS2_ @ 12070 NONAME
+ _ZN13QS60MainAppUi25HandleTouchPaneSizeChangeEv @ 12071 NONAME
+ _ZN13QS60MainAppUi26HandleScreenDeviceChangedLEv @ 12072 NONAME
+ _ZN13QS60MainAppUi31HandleApplicationSpecificEventLEiRK8TWsEvent @ 12073 NONAME
+ _ZN13QS60MainAppUi4ExitEv @ 12074 NONAME
+ _ZN13QS60MainAppUi9SetFadedLEi @ 12075 NONAME
+ _ZN16QS60MainDocument9OpenFileLERP10CFileStoreR5RFile @ 12076 NONAME
+ _ZN16QS60MainDocument9OpenFileLEiRK7TDesC16R3RFs @ 12077 NONAME
+ _ZN19QS60MainApplication13NewAppServerLERP13CApaAppServer @ 12078 NONAME
+ _ZN19QS60MainApplication16PreDocConstructLEv @ 12079 NONAME
+ _ZNK13QS60MainAppUi15ApplicationRectEv @ 12080 NONAME
+ _ZNK19QS60MainApplication13OpenIniFileLCER3RFs @ 12081 NONAME
+ _ZThn100_N13QS60MainAppUi25HandleTouchPaneSizeChangeEv @ 12082 NONAME
+ _ZThn24_N13QS60MainAppUi15ProcessCommandLEi @ 12083 NONAME
+ _ZThn40_N13QS60MainAppUi15MopSupplyObjectE8TTypeUid @ 12084 NONAME
+ _ZThn92_N13QS60MainAppUi22HandleViewDeactivationERK10TVwsViewIdS2_ @ 12085 NONAME