diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-10-08 10:33:42 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-10-08 10:33:42 (GMT) |
| commit | e086a153c25d3bd5d58d72c34384d8452cb3b3be (patch) | |
| tree | 1ec8e8bfa3fc3a99b1285cc863e61ec65a97ee48 /src/s60installs/bwins | |
| parent | a780773292c3a59e1500f5e36c3de729a8f45f1c (diff) | |
| parent | 392ecc76cdbcef37ee492400a1b783106a37ad36 (diff) | |
| download | Qt-e086a153c25d3bd5d58d72c34384d8452cb3b3be.zip Qt-e086a153c25d3bd5d58d72c34384d8452cb3b3be.tar.gz Qt-e086a153c25d3bd5d58d72c34384d8452cb3b3be.tar.bz2 | |
Merge remote branch 'qt/master' into earth/file-engine-refactor
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/s60installs/bwins')
| -rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 7805dae..9a61523 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12892,4 +12892,5 @@ EXPORTS ?setTimeout@QTapAndHoldGesture@@SAXH@Z @ 12891 NONAME ; void QTapAndHoldGesture::setTimeout(int) ?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ; class QString QApplicationPrivate::qmljsDebugArguments ?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@PAVQGraphicsItem@@@Z @ 12893 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(class QGraphicsItem *) const + ?lastResortFont@QFont@@QBE?AVQString@@XZ @ 12894 NONAME ; class QString QFont::lastResortFont(void) const |