From 8295acce8b1ec3959bfd1d93028c31f49d5a5a67 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 15 Apr 2010 15:45:37 +0300 Subject: Fix option(recursive) QMakeProject::init initializes the whole project, while QMakeProject::reset initializes the parser for a single file. "recursive" needs to apply to the whole project. Task-number: QTBUG-9847 Reviewed-by: Oswald Buddenhagen --- qmake/project.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/project.cpp b/qmake/project.cpp index 764264f..01f997f 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -675,6 +675,7 @@ QMakeProject::init(QMakeProperty *p, const QMap *vars) prop = p; own_prop = false; } + recursive = false; reset(); } @@ -699,7 +700,6 @@ QMakeProject::reset() scope_blocks.push(ScopeBlock()); iterator = 0; function = 0; - recursive = false; } bool -- cgit v0.12 From 1e0cb74f433083d2cafa21da3e34e87a35838b90 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Wed, 14 Apr 2010 15:10:55 +0200 Subject: Fix check for arm based systems The lib is only on the phone, so check the dso file instead. --- mkspecs/features/symbian/stl.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index 85c758a..3091fce 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -21,8 +21,8 @@ STL_LIB = -llibstdcppv5.dll STL_MMP_RULE = "STDCPP" # Fall back to old implementation if that is the only one that is found -exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcpp.dll)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcpp.dll) { - !exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll):!exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) { +exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcpp.dso)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcpp.dll) { + !exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso):!exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) { STL_LIB = -llibstdcpp.dll STL_MMP_RULE = } -- cgit v0.12 From 9827cd78256c24e8311400198864aaadfff4e7ab Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Wed, 7 Apr 2010 14:36:46 +0200 Subject: Simplify docs a bit --- doc/src/snippets/code/src_gui_text_qtextlayout.cpp | 2 -- src/gui/text/qtextlayout.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp b/doc/src/snippets/code/src_gui_text_qtextlayout.cpp index ad5725e..13040ea 100644 --- a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp +++ b/doc/src/snippets/code/src_gui_text_qtextlayout.cpp @@ -42,7 +42,6 @@ //! [0] int leading = fontMetrics.leading(); qreal height = 0; -qreal widthUsed = 0; textLayout.beginLayout(); while (1) { QTextLine line = textLayout.createLine(); @@ -53,7 +52,6 @@ while (1) { height += leading; line.setPosition(QPointF(0, height)); height += line.height(); - widthUsed = qMax(widthUsed, line.naturalTextWidth()); } textLayout.endLayout(); //! [0] diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 312d135..ce7915d 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -305,7 +305,7 @@ Qt::LayoutDirection QTextInlineObject::textDirection() const Once the layout is done, these lines can be drawn on a paint device. - Here's some pseudo code that presents the layout phase: + Here's some code snippet that presents the layout phase: \snippet doc/src/snippets/code/src_gui_text_qtextlayout.cpp 0 The text can be drawn by calling the layout's draw() function: -- cgit v0.12 From 113b65dce51f37566b58fd730b206537820889e6 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Mon, 12 Apr 2010 14:10:28 +0200 Subject: Make debugging floating point mistakes much easier. Its a common mistake that a floating point error, like divide by zero, is not detected and just propagated till it breaks in curious ways elsewhere. Like QBezier hitting an infinite loop due to operating on NaN floating points. Adding detection of this in a debug build of Qt is sure to help a lot of these issues be detected much faster and so Qt helps people write code even faster. Reviewed-By: Gunnar Sletta --- src/gui/painting/qtransform.cpp | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 988d678..80b7520 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -47,6 +47,7 @@ #include "qpainterpath.h" #include "qvariant.h" #include +#include #include @@ -410,6 +411,12 @@ QTransform &QTransform::translate(qreal dx, qreal dy) { if (dx == 0 && dy == 0) return *this; +#ifndef QT_NO_DEBUG + if (qIsNaN(dx) | qIsNaN(dy)) { + qWarning() << "QTransform::translate with NaN called"; + return *this; + } +#endif switch(inline_type()) { case TxNone: @@ -447,6 +454,12 @@ QTransform &QTransform::translate(qreal dx, qreal dy) */ QTransform QTransform::fromTranslate(qreal dx, qreal dy) { +#ifndef QT_NO_DEBUG + if (qIsNaN(dx) | qIsNaN(dy)) { + qWarning() << "QTransform::fromTranslate with NaN called"; + return QTransform(); +} +#endif QTransform transform(1, 0, 0, 0, 1, 0, dx, dy, 1, true); if (dx == 0 && dy == 0) transform.m_type = TxNone; @@ -466,6 +479,12 @@ QTransform & QTransform::scale(qreal sx, qreal sy) { if (sx == 1 && sy == 1) return *this; +#ifndef QT_NO_DEBUG + if (qIsNaN(sx) | qIsNaN(sy)) { + qWarning() << "QTransform::scale with NaN called"; + return *this; + } +#endif switch(inline_type()) { case TxNone: @@ -501,6 +520,12 @@ QTransform & QTransform::scale(qreal sx, qreal sy) */ QTransform QTransform::fromScale(qreal sx, qreal sy) { +#ifndef QT_NO_DEBUG + if (qIsNaN(sx) | qIsNaN(sy)) { + qWarning() << "QTransform::fromScale with NaN called"; + return QTransform(); +} +#endif QTransform transform(sx, 0, 0, 0, sy, 0, 0, 0, 1, true); if (sx == 1. && sy == 1.) transform.m_type = TxNone; @@ -520,6 +545,12 @@ QTransform & QTransform::shear(qreal sh, qreal sv) { if (sh == 0 && sv == 0) return *this; +#ifndef QT_NO_DEBUG + if (qIsNaN(sh) | qIsNaN(sv)) { + qWarning() << "QTransform::shear with NaN called"; + return *this; + } +#endif switch(inline_type()) { case TxNone: @@ -575,6 +606,12 @@ QTransform & QTransform::rotate(qreal a, Qt::Axis axis) { if (a == 0) return *this; +#ifndef QT_NO_DEBUG + if (qIsNaN(a)) { + qWarning() << "QTransform::rotate with NaN called"; + return *this; + } +#endif qreal sina = 0; qreal cosa = 0; @@ -660,6 +697,12 @@ QTransform & QTransform::rotate(qreal a, Qt::Axis axis) */ QTransform & QTransform::rotateRadians(qreal a, Qt::Axis axis) { +#ifndef QT_NO_DEBUG + if (qIsNaN(a)) { + qWarning() << "QTransform::rotateRadians with NaN called"; + return *this; + } +#endif qreal sina = qSin(a); qreal cosa = qCos(a); -- cgit v0.12 From ab54d7897969ce1ea40e1ff6155022995fe284fc Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Thu, 15 Apr 2010 16:08:12 +0200 Subject: Set library path properly for all systems This makes webkit link again on symbian/linux --- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri index 902e6f3..754bd0e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri @@ -72,10 +72,11 @@ defineTest(addJavaScriptCoreLib) { pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR win32-msvc* { - LIBS += -L$$pathToJavaScriptCoreOutput + QMAKE_LIBDIR += $$pathToJavaScriptCoreOutput LIBS += -l$$JAVASCRIPTCORE_TARGET } else:symbian { LIBS += -l$${JAVASCRIPTCORE_TARGET}.lib + QMAKE_LIBDIR += $$pathToJavaScriptCoreOutput } else { # Make sure jscore will be early in the list of libraries to workaround a bug in MinGW # that can't resolve symbols from QtCore if libjscore comes after. -- cgit v0.12 From 0c92a94950a45474029c76f470e3db3cc0a4b9fc Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Thu, 15 Apr 2010 16:08:55 +0200 Subject: Webkit got bigger, make it link again on armlink --- mkspecs/symbian/linux-armcc/qmake.conf | 1 + src/3rdparty/webkit/WebCore/WebCore.pro | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index 6042fa4..599e552 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -29,6 +29,7 @@ QMAKE_QtGui_LFLAGS = "--rw-base 0x800000" #QMAKE_QtTest_CXXFLAGS = #QMAKE_QtXmlPatterns_CXXFLAGS = #QMAKE_QtXml_CXXFLAGS = +QMAKE_QtWebKit_CXXFLAGS = --arm # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. QMAKE_QtWebKit_LFLAGS = --rw-base 0xE00000 diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index bdb3f83..653781c 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -35,10 +35,13 @@ symbian: { # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000 MMP_RULES += ALWAYS_BUILD_AS_ARM + } else { + QMAKE_CFLAGS -= --thumb + QMAKE_CXXFLAGS -= --thumb } - CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3 } + isEmpty(OUTPUT_DIR): OUTPUT_DIR = .. include($$PWD/../WebKit.pri) -- cgit v0.12 From 33aac2ca5b79afcb08c13c2b4092acfdb5056fdb Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 16 Apr 2010 15:01:37 +0300 Subject: Fixed automatic patching of self-signed packages - Don't autopatch when just preprocessing pkg or creating stub package - Copy binaries before patching so that originals are preserved. - Only autopatch the preprocessed file so that original template is preserved. - Added clear warning to patch_capabilities.pl to notify users that patched package is not suitable for distribution. Task-number: QTBUG-9972 Reviewed-by: Shane Kearns --- bin/createpackage.pl | 13 +++++++++---- bin/patch_capabilities.pl | 27 +++++++++++++++++++++------ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 554d619..23fe26d 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -101,6 +101,10 @@ Example with certfile: If no certificate and key files are provided, either a RnD certificate or a self-signed certificate from QtDir\\src\\s60installs directory is used. +In the latter case the resulting package will also be automatically patched +using patch_capabilities.pl script, which makes it unsuitable for distribution. +Always specify certificates explicitly if you wish to distribute your package. + ============================================================================================== ENDUSAGESTRING @@ -237,10 +241,6 @@ if (!$preservePkgOutput) { } # Preprocess PKG -if ($certtext eq "Self Signed" && !@certificates) { - print("Patching capabilities for self signed package $certificate\n"); - system ("patch_capabilities $templatepkg $targetplatform"); -} local $/; # read template file @@ -277,6 +277,11 @@ if($stub) { # Create stub SIS. system ("makesis -s $pkgoutput $stub_sis_name"); } else { + if ($certtext eq "Self Signed" && !@certificates) { + print("Auto-patching capabilities for self signed package.\n"); + system ("patch_capabilities $pkgoutput"); + } + # Create SIS. # The 'and' is because system uses 0 to indicate success. system ("makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl index 4390957..9741bc3 100755 --- a/bin/patch_capabilities.pl +++ b/bin/patch_capabilities.pl @@ -46,6 +46,8 @@ # ####################################################################### +use File::Copy; + sub Usage() { print("This script can be used to set capabilities of all binaries\n"); print("specified for deployment in a .pkg file.\n"); @@ -107,6 +109,9 @@ if (@ARGV) # If the specified ".pkg" file exists (and can be read), if (($pkgFileName =~ m|\.pkg$|i) && -r($pkgFileName)) { + print ("\n"); + print ("Patching package file and relevant binaries...\n"); + # If there are more arguments given, parse them as capabilities. if (@ARGV) { @@ -180,15 +185,10 @@ if (@ARGV) $manufacturerElseBlock = 0; } - print NEW_PKG $newLine; - - chomp ($line); - # If the line specifies a file, parse the source and destination locations. if ($line =~ m|\"([^\"]+)\"\s*\-\s*\"([^\"]+)\"|) { my $sourcePath = $1; - my $destinationPath = $2; # If the given file is a binary, check the target and binary type (+ the actual filename) from its path. if ($sourcePath =~ m:\w+(\.dll|\.exe)$:i) @@ -201,9 +201,22 @@ if (@ARGV) $sourcePath =~ s/\$\(TARGET\)/$target/gm; } - push (@binaries, $sourcePath); + # Change the source file name (but only if not already patched) + my $patchedSourcePath = $sourcePath; + if ($patchedSourcePath !~ m/_patched_caps/) + { + $newLine =~ s/(^.*)(\.dll|\.exe)(.*)(\.dll|\.exe)/$1_patched_caps$2$3$4/i; + $patchedSourcePath =~ s/(^.*)(\.dll|\.exe)/$1_patched_caps$2/i; + + copy($sourcePath, $patchedSourcePath) or die "$sourcePath cannot be copied for patching."; + } + push (@binaries, $patchedSourcePath); } } + + print NEW_PKG $newLine; + + chomp ($line); } close (PKG); @@ -256,6 +269,8 @@ if (@ARGV) } print ("\n"); + print ("NOTE: A patched package should not be used for distribution!\n"); + print ("\n"); } } else -- cgit v0.12 From 36d43043b0a82620de58db7105152f087f99d535 Mon Sep 17 00:00:00 2001 From: Iain Date: Thu, 15 Apr 2010 16:41:58 +0200 Subject: Symbol visibility fixes for RVCT4 on Symbian RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: Other Qt modules and QtScript are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron Janne Koskinen (cherry picked from commit 81837e43e3f966c1755e90eb65df6e3bad506ed7) --- src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp b/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp index d7982fa..2fcce5b 100644 --- a/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp +++ b/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp @@ -51,7 +51,7 @@ #include "NotImplemented.h" QT_BEGIN_NAMESPACE -extern Q_GUI_EXPORT bool qt_tab_all_widgets; // from qapplication.cpp +Q_DECL_IMPORT extern bool qt_tab_all_widgets; // from qapplication.cpp QT_END_NAMESPACE namespace WebCore { -- cgit v0.12 From 8f1b5bc690e3e3ddc9c23b358ef0b34f259361f7 Mon Sep 17 00:00:00 2001 From: Iain Date: Thu, 15 Apr 2010 16:38:02 +0200 Subject: Symbol visibility fixes for RVCT4 on Symbian RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: QtWebkit and other Qt modules are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron (cherry picked from commit b2271d364cdc26187e5f9113f4c1816f334e37a1) --- src/script/api/qscriptengine.cpp | 2 +- src/script/parser/qscriptlexer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 58c8d83..54615d5 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -2006,7 +2006,7 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun, #ifndef QT_NO_REGEXP -extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); +Q_DECL_IMPORT extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); /*! Creates a QtScript object of class RegExp with the given diff --git a/src/script/parser/qscriptlexer.cpp b/src/script/parser/qscriptlexer.cpp index 38ad6ce..ca64776 100644 --- a/src/script/parser/qscriptlexer.cpp +++ b/src/script/parser/qscriptlexer.cpp @@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE -extern double qstrtod(const char *s00, char const **se, bool *ok); +Q_DECL_IMPORT extern double qstrtod(const char *s00, char const **se, bool *ok); #define shiftWindowsLineBreak() \ do { \ -- cgit v0.12 From 26b6822674d1f96c4fdc9cb2078e7212372fa9ff Mon Sep 17 00:00:00 2001 From: Iain Date: Thu, 15 Apr 2010 16:19:50 +0200 Subject: Symbol visibility fixes for RVCT4 on Symbian RVCT 4 is far more strict with regards to symbol visiblity that RVCT 2.2, and will hide symbols unless all references have default visibility in the object files. Update the various places in Qt code where the symbol visibility was set incorrectly for DLL-based platforms (those that use __declspec(dllimport) and (dllexport). Note: QtWebkit and QtScript are fixed in different commits. Task-number: QTBUG-9903 Reviewed-by: Jason Barron (cherry picked from commit a7ded5708ce81a37404cc0db8de84521c2aa693d) --- src/gui/graphicsview/qgraphicsproxywidget.cpp | 2 +- src/gui/image/qimage.cpp | 4 ++-- src/gui/image/qpaintengine_pic.cpp | 2 +- src/gui/image/qpicture.cpp | 4 ++-- src/gui/image/qpixmap_raster.cpp | 4 ++-- src/gui/image/qpixmapfilter.cpp | 2 +- src/gui/kernel/qapplication.cpp | 2 +- src/gui/kernel/qwhatsthis.cpp | 2 +- src/gui/painting/qbrush.cpp | 3 +-- src/gui/painting/qpaintbuffer.cpp | 4 ++-- src/gui/painting/qpaintengine_alpha.cpp | 4 ++-- src/gui/painting/qpaintengine_raster.cpp | 4 ++-- src/gui/painting/qpaintengineex.cpp | 2 +- src/gui/painting/qpdf.cpp | 2 +- src/gui/painting/qstroker.cpp | 2 +- src/gui/text/qfontdatabase.cpp | 2 +- src/gui/text/qfontmetrics.cpp | 2 +- src/gui/text/qtextdocument.cpp | 2 +- src/gui/text/qtextdocumentlayout.cpp | 2 +- src/gui/text/qtextengine.cpp | 4 ++-- src/gui/text/qtextimagehandler.cpp | 2 +- src/gui/widgets/qabstractbutton.cpp | 2 +- src/openvg/qpaintengine_vg.cpp | 8 ++++---- src/openvg/qpixmapdata_vg.cpp | 4 ++-- src/svg/qsvghandler.cpp | 2 +- src/xmlpatterns/data/qdecimal_p.h | 2 +- 26 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp index 2132526..75007e6 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.cpp +++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp @@ -189,7 +189,7 @@ QT_BEGIN_NAMESPACE */ extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); -extern bool qt_tab_all_widgets; +Q_GUI_EXPORT extern bool qt_tab_all_widgets; /*! \internal diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index d226baf..85be5b1 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -118,8 +118,8 @@ const QVector *qt_image_colortable(const QImage &image) return &image.d->colortable; } -extern int qt_defaultDpiX(); -extern int qt_defaultDpiY(); +Q_GUI_EXPORT extern int qt_defaultDpiX(); +Q_GUI_EXPORT extern int qt_defaultDpiY(); QBasicAtomicInt qimage_serial_number = Q_BASIC_ATOMIC_INITIALIZER(1); diff --git a/src/gui/image/qpaintengine_pic.cpp b/src/gui/image/qpaintengine_pic.cpp index 029154b..fd1ee6a 100644 --- a/src/gui/image/qpaintengine_pic.cpp +++ b/src/gui/image/qpaintengine_pic.cpp @@ -477,7 +477,7 @@ void QPicturePaintEngine::drawImage(const QRectF &r, const QImage &image, const writeCmdLength(pos, r, false); } -extern int qt_defaultDpi(); +Q_GUI_EXPORT extern int qt_defaultDpi(); void QPicturePaintEngine::drawTextItem(const QPointF &p , const QTextItem &ti) { diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 45b3ed0..20a1dce 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -108,8 +108,8 @@ void qt_format_text(const QFont &fnt, const QRectF &_r, const char *qt_mfhdr_tag = "QPIC"; // header tag static const quint16 mfhdr_maj = 11; // major version # static const quint16 mfhdr_min = 0; // minor version # -extern int qt_defaultDpiX(); -extern int qt_defaultDpiY(); +Q_GUI_EXPORT extern int qt_defaultDpiX(); +Q_GUI_EXPORT extern int qt_defaultDpiY(); /*! Constructs an empty picture. diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index b183d0d..9dc15fc 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -361,8 +361,8 @@ QPaintEngine* QRasterPixmapData::paintEngine() const return image.paintEngine(); } -extern int qt_defaultDpiX(); -extern int qt_defaultDpiY(); +Q_GUI_EXPORT extern int qt_defaultDpiX(); +Q_GUI_EXPORT extern int qt_defaultDpiY(); int QRasterPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const { diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index 5355ad3..70770c4 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -898,7 +898,7 @@ Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, in expblur<12, 10, false>(blurImage, radius, quality, transposed); } -bool qt_scaleForTransform(const QTransform &transform, qreal *scale); +Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); /*! \internal diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 62e99e9..ec635d4 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -142,7 +142,7 @@ static void initResources() QT_BEGIN_NAMESPACE -extern void qt_call_post_routines(); +Q_DECL_IMPORT extern void qt_call_post_routines(); int QApplicationPrivate::app_compile_version = 0x040000; //we don't know exactly, but it's at least 4.0.0 diff --git a/src/gui/kernel/qwhatsthis.cpp b/src/gui/kernel/qwhatsthis.cpp index b877784..6181b62 100644 --- a/src/gui/kernel/qwhatsthis.cpp +++ b/src/gui/kernel/qwhatsthis.cpp @@ -143,7 +143,7 @@ QT_BEGIN_NAMESPACE \sa QToolTip */ -extern void qDeleteInEventHandler(QObject *o); +Q_DECL_IMPORT extern void qDeleteInEventHandler(QObject *o); class QWhatsThat : public QWidget { diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 182cce9..96d547b 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -160,8 +160,7 @@ static void qt_cleanup_brush_pattern_image_cache() qt_brushPatternImageCache()->cleanup(); } -Q_GUI_EXPORT -QImage qt_imageForBrush(int brushStyle, bool invert) +Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert) { return qt_brushPatternImageCache()->getImage(brushStyle, invert); } diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp index e1156dc..cd6718d 100644 --- a/src/gui/painting/qpaintbuffer.cpp +++ b/src/gui/painting/qpaintbuffer.cpp @@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE -extern int qt_defaultDpiX(); -extern int qt_defaultDpiY(); +Q_GUI_EXPORT extern int qt_defaultDpiX(); +Q_GUI_EXPORT extern int qt_defaultDpiY(); extern void qt_format_text(const QFont &font, const QRectF &_r, int tf, const QTextOption *option, const QString& str, QRectF *brect, int tabstops, int* tabarray, int tabarraylen, diff --git a/src/gui/painting/qpaintengine_alpha.cpp b/src/gui/painting/qpaintengine_alpha.cpp index 5a3c0cf..4b1c58d 100644 --- a/src/gui/painting/qpaintengine_alpha.cpp +++ b/src/gui/painting/qpaintengine_alpha.cpp @@ -93,8 +93,8 @@ bool QAlphaPaintEngine::begin(QPaintDevice *pdev) return true; } -extern int qt_defaultDpiX(); -extern int qt_defaultDpiY(); +Q_GUI_EXPORT extern int qt_defaultDpiX(); +Q_GUI_EXPORT extern int qt_defaultDpiY(); bool QAlphaPaintEngine::end() { diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 03d0825..8f14583 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE -extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp +Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp #define qreal_to_fixed_26_6(f) (int(f * 64)) #define qt_swap_int(x, y) { int tmp = (x); (x) = (y); (y) = tmp; } @@ -4996,7 +4996,7 @@ void QSpanData::init(QRasterBuffer *rb, const QRasterPaintEngine *pe) clip = pe ? pe->d_func()->clip() : 0; } -extern QImage qt_imageForBrush(int brushStyle, bool invert); +Q_GUI_EXPORT extern QImage qt_imageForBrush(int brushStyle, bool invert); void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode compositionMode) { diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index 990e3c4..9366513 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -380,7 +380,7 @@ QPainterState *QPaintEngineEx::createState(QPainterState *orig) const return new QPainterState(orig); } -extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp +Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) { diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index dcf745f..44049c0 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -extern int qt_defaultDpi(); +Q_GUI_EXPORT extern int qt_defaultDpi(); #ifndef QT_NO_PRINTER diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index 9740fce..e43544c 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -825,7 +825,7 @@ qreal qt_t_for_arc_angle(qreal angle) return t; } -void qt_find_ellipse_coords(const QRectF &r, qreal angle, qreal length, +Q_GUI_EXPORT void qt_find_ellipse_coords(const QRectF &r, qreal angle, qreal length, QPointF* startPoint, QPointF *endPoint); /*! diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 6803120..ae5e9ca 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE #define SMOOTH_SCALABLE 0xffff -extern int qt_defaultDpiY(); // in qfont.cpp +Q_GUI_EXPORT extern int qt_defaultDpiY(); // in qfont.cpp bool qt_enable_test_font = false; diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 3a52e8e..5163c94 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -63,7 +63,7 @@ extern void qt_format_text(const QFont& font, const QRectF &_r, int tf, const QString &text, QRectF *brect, int tabStops, int *tabArray, int tabArrayLen, QPainter *painter); -extern int qt_defaultDpi(); +Q_GUI_EXPORT extern int qt_defaultDpi(); /***************************************************************************** QFontMetrics member functions diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 9a1b70c..3e556a7 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -1656,7 +1656,7 @@ static void printPage(int index, QPainter *painter, const QTextDocument *doc, co painter->restore(); } -extern int qt_defaultDpi(); +Q_GUI_EXPORT extern int qt_defaultDpi(); /*! Prints the document to the given \a printer. The QPrinter must be diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index b45fcbb..f12bf0b 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE -extern int qt_defaultDpi(); +Q_GUI_EXPORT extern int qt_defaultDpi(); // ################ should probably add frameFormatChange notification! diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 6485966..d34553f 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -856,7 +856,7 @@ void QTextEngine::shapeLine(const QScriptLine &line) } } -extern int qt_defaultDpiY(); // in qfont.cpp +Q_GUI_EXPORT extern int qt_defaultDpiY(); // in qfont.cpp void QTextEngine::shapeText(int item) const { @@ -2494,7 +2494,7 @@ void QTextEngine::splitItem(int item, int pos) const // qDebug("split at position %d itempos=%d", pos, item); } -extern int qt_defaultDpiY(); +Q_GUI_EXPORT extern int qt_defaultDpiY(); QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const { diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index fa49a32..6733793 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -123,7 +123,7 @@ static QSize getPixmapSize(QTextDocument *doc, const QTextImageFormat &format) qreal scale = 1.0; QPaintDevice *pdev = doc->documentLayout()->paintDevice(); if (pdev) { - extern int qt_defaultDpi(); + Q_GUI_EXPORT extern int qt_defaultDpi(); if (pm.isNull()) pm = getPixmap(doc, format); if (!pm.isNull()) diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/gui/widgets/qabstractbutton.cpp index 5ceb237..995d659 100644 --- a/src/gui/widgets/qabstractbutton.cpp +++ b/src/gui/widgets/qabstractbutton.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE #define AUTO_REPEAT_DELAY 300 #define AUTO_REPEAT_INTERVAL 100 -extern bool qt_tab_all_widgets; +Q_GUI_EXPORT extern bool qt_tab_all_widgets; /*! \class QAbstractButton diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index d1e899a..5ae69cd 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -75,8 +75,8 @@ QT_BEGIN_NAMESPACE #if !defined(QVG_NO_DRAW_GLYPHS) -extern int qt_defaultDpiX(); -extern int qt_defaultDpiY(); +Q_DECL_IMPORT extern int qt_defaultDpiX(); +Q_DECL_IMPORT extern int qt_defaultDpiY(); class QVGPaintEnginePrivate; @@ -496,7 +496,7 @@ void QVGPaintEnginePrivate::setTransform vgLoadMatrix(mat); } -extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); +Q_DECL_IMPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); void QVGPaintEnginePrivate::updateTransform(QPaintDevice *pdev) { @@ -974,7 +974,7 @@ VGPath QVGPaintEnginePrivate::roundedRectPath(const QRectF &rect, qreal xRadius, return vgpath; } -extern QImage qt_imageForBrush(int style, bool invert); +Q_DECL_IMPORT extern QImage qt_imageForBrush(int style, bool invert); static QImage colorizeBitmap(const QImage &image, const QColor &color) { diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp index 6258e0c..a4afc95 100644 --- a/src/openvg/qpixmapdata_vg.cpp +++ b/src/openvg/qpixmapdata_vg.cpp @@ -347,8 +347,8 @@ void QVGPixmapData::reclaimImages() destroyImages(); } -extern int qt_defaultDpiX(); -extern int qt_defaultDpiY(); +Q_DECL_IMPORT extern int qt_defaultDpiX(); +Q_DECL_IMPORT extern int qt_defaultDpiY(); int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const { diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index bc4ca76..038aeb4 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE static const char *qt_inherit_text = "inherit"; #define QT_INHERIT QLatin1String(qt_inherit_text) -double qstrtod(const char *s00, char const **se, bool *ok); +Q_DECL_IMPORT double qstrtod(const char *s00, char const **se, bool *ok); // ======== duplicated from qcolor_p diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h index b746ff9..d17b647 100644 --- a/src/xmlpatterns/data/qdecimal_p.h +++ b/src/xmlpatterns/data/qdecimal_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE /** * Defined in QtCore's qlocale.cpp. */ -extern char *qdtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp); +Q_DECL_IMPORT extern char *qdtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp); namespace QPatternist { -- cgit v0.12 From b5eeb8a5facc34e66a34ba317d2ed63b6d1be4af Mon Sep 17 00:00:00 2001 From: Iain Date: Fri, 16 Apr 2010 21:31:38 +0200 Subject: Further RVCT4 fixes for Symbian More corrections to declarations to ensure symbol visibility is correct Task-number: QTBUG-9998 Reviewed-by: TrustMe --- src/declarative/qml/parser/qdeclarativejslexer.cpp | 2 +- src/gui/text/qstatictext.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp index a616146..3a0e897 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp @@ -57,7 +57,7 @@ #include QT_BEGIN_NAMESPACE -extern double qstrtod(const char *s00, char const **se, bool *ok); +Q_DECL_IMPORT extern double qstrtod(const char *s00, char const **se, bool *ok); QT_END_NAMESPACE QT_QML_BEGIN_NAMESPACE diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 06b0d3b..d7bf34e 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -387,8 +387,8 @@ QStaticTextPrivate *QStaticTextPrivate::get(const QStaticText *q) return q->data.data(); } -extern int qt_defaultDpiX(); -extern int qt_defaultDpiY(); +Q_GUI_EXPORT extern int qt_defaultDpiX(); +Q_GUI_EXPORT extern int qt_defaultDpiY(); namespace { -- cgit v0.12 From daaaea2d79f37c7fa22eef174d6489939e965a8e Mon Sep 17 00:00:00 2001 From: Iain Date: Fri, 16 Apr 2010 23:06:23 +0200 Subject: EABI and BWINS DEF file updates for Symbian Reviewed-by: TrustMe --- src/s60installs/bwins/QtCoreu.def | 6 ++- src/s60installs/bwins/QtDeclarativeu.def | 84 ++++++++++++++++++++------------ src/s60installs/bwins/QtGuiu.def | 25 +++++++++- src/s60installs/bwins/QtOpenVGu.def | 5 +- src/s60installs/eabi/QtCoreu.def | 6 ++- src/s60installs/eabi/QtDeclarativeu.def | 33 +++++++++---- src/s60installs/eabi/QtGuiu.def | 21 ++++++++ src/s60installs/eabi/QtOpenVGu.def | 5 +- 8 files changed, 139 insertions(+), 46 deletions(-) diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def index c2692f6..8b2d7e8 100644 --- a/src/s60installs/bwins/QtCoreu.def +++ b/src/s60installs/bwins/QtCoreu.def @@ -4458,6 +4458,8 @@ EXPORTS ?toMSecsSinceEpoch@QDateTime@@QBE_JXZ @ 4457 NONAME ; long long QDateTime::toMSecsSinceEpoch(void) const ?transitions@QState@@QBE?AV?$QList@PAVQAbstractTransition@@@@XZ @ 4458 NONAME ; class QList QState::transitions(void) const ?validCodecs@QTextCodec@@CA_NXZ @ 4459 NONAME ; bool QTextCodec::validCodecs(void) - ?destroyed@QDeclarativeData@@2P6AXPAV1@PAVQObject@@@ZA @ 4460 NONAME ; void (*QDeclarativeData::destroyed)(class QDeclarativeData *, class QObject *) - ?parentChanged@QDeclarativeData@@2P6AXPAV1@PAVQObject@@1@ZA @ 4461 NONAME ; void (*QDeclarativeData::parentChanged)(class QDeclarativeData *, class QObject *, class QObject *) + ?destroyed@QDeclarativeData@@2P6AXPAV1@PAVQObject@@@ZA @ 4460 NONAME ABSENT ; void (*QDeclarativeData::destroyed)(class QDeclarativeData *, class QObject *) + ?parentChanged@QDeclarativeData@@2P6AXPAV1@PAVQObject@@1@ZA @ 4461 NONAME ABSENT ; void (*QDeclarativeData::parentChanged)(class QDeclarativeData *, class QObject *, class QObject *) + ?parentChanged@QAbstractDeclarativeData@@2P6AXPAV1@PAVQObject@@1@ZA @ 4462 NONAME ; void (*QAbstractDeclarativeData::parentChanged)(class QAbstractDeclarativeData *, class QObject *, class QObject *) + ?destroyed@QAbstractDeclarativeData@@2P6AXPAV1@PAVQObject@@@ZA @ 4463 NONAME ; void (*QAbstractDeclarativeData::destroyed)(class QAbstractDeclarativeData *, class QObject *) diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def index 3eba5e7..35cb06d 100644 --- a/src/s60installs/bwins/QtDeclarativeu.def +++ b/src/s60installs/bwins/QtDeclarativeu.def @@ -3,7 +3,7 @@ EXPORTS ??0QDeclarativeAction@@QAE@PAVQObject@@ABVQString@@ABVQVariant@@@Z @ 2 NONAME ; QDeclarativeAction::QDeclarativeAction(class QObject *, class QString const &, class QVariant const &) ??0QDeclarativeAction@@QAE@XZ @ 3 NONAME ; QDeclarativeAction::QDeclarativeAction(void) ??0QDeclarativeAnchorChanges@@QAE@PAVQObject@@@Z @ 4 NONAME ; QDeclarativeAnchorChanges::QDeclarativeAnchorChanges(class QObject *) - ??0QDeclarativeAnchors@@QAE@PAVQDeclarativeItem@@PAVQObject@@@Z @ 5 NONAME ; QDeclarativeAnchors::QDeclarativeAnchors(class QDeclarativeItem *, class QObject *) + ??0QDeclarativeAnchors@@QAE@PAVQDeclarativeItem@@PAVQObject@@@Z @ 5 NONAME ABSENT ; QDeclarativeAnchors::QDeclarativeAnchors(class QDeclarativeItem *, class QObject *) ??0QDeclarativeAnchors@@QAE@PAVQObject@@@Z @ 6 NONAME ; QDeclarativeAnchors::QDeclarativeAnchors(class QObject *) ??0QDeclarativeAnimatedImage@@QAE@PAVQDeclarativeItem@@@Z @ 7 NONAME ; QDeclarativeAnimatedImage::QDeclarativeAnimatedImage(class QDeclarativeItem *) ??0QDeclarativeBasePositioner@@IAE@AAVQDeclarativeBasePositionerPrivate@@W4PositionerType@0@PAVQDeclarativeItem@@@Z @ 8 NONAME ; QDeclarativeBasePositioner::QDeclarativeBasePositioner(class QDeclarativeBasePositionerPrivate &, enum QDeclarativeBasePositioner::PositionerType, class QDeclarativeItem *) @@ -673,7 +673,7 @@ EXPORTS ?cellHeightChanged@QDeclarativeGridView@@IAEXXZ @ 672 NONAME ; void QDeclarativeGridView::cellHeightChanged(void) ?cellWidth@QDeclarativeGridView@@QBEHXZ @ 673 NONAME ; int QDeclarativeGridView::cellWidth(void) const ?cellWidthChanged@QDeclarativeGridView@@IAEXXZ @ 674 NONAME ; void QDeclarativeGridView::cellWidthChanged(void) - ?centerIn@QDeclarativeAnchors@@QBEPAVQDeclarativeItem@@XZ @ 675 NONAME ; class QDeclarativeItem * QDeclarativeAnchors::centerIn(void) const + ?centerIn@QDeclarativeAnchors@@QBEPAVQDeclarativeItem@@XZ @ 675 NONAME ABSENT ; class QDeclarativeItem * QDeclarativeAnchors::centerIn(void) const ?centerInChanged@QDeclarativeAnchors@@IAEXXZ @ 676 NONAME ; void QDeclarativeAnchors::centerInChanged(void) ?changed@QDeclarativePath@@IAEXXZ @ 677 NONAME ; void QDeclarativePath::changed(void) ?changed@QDeclarativePathElement@@IAEXXZ @ 678 NONAME ; void QDeclarativePathElement::changed(void) @@ -1113,13 +1113,13 @@ EXPORTS ?fadeInDurationChanged@QDeclarativeParticles@@IAEXXZ @ 1112 NONAME ABSENT ; void QDeclarativeParticles::fadeInDurationChanged(void) ?fadeOutDuration@QDeclarativeParticles@@QBEHXZ @ 1113 NONAME ABSENT ; int QDeclarativeParticles::fadeOutDuration(void) const ?fadeOutDurationChanged@QDeclarativeParticles@@IAEXXZ @ 1114 NONAME ABSENT ; void QDeclarativeParticles::fadeOutDurationChanged(void) - ?fill@QDeclarativeAnchors@@QBEPAVQDeclarativeItem@@XZ @ 1115 NONAME ; class QDeclarativeItem * QDeclarativeAnchors::fill(void) const + ?fill@QDeclarativeAnchors@@QBEPAVQDeclarativeItem@@XZ @ 1115 NONAME ABSENT ; class QDeclarativeItem * QDeclarativeAnchors::fill(void) const ?fillChanged@QDeclarativeAnchors@@IAEXXZ @ 1116 NONAME ; void QDeclarativeAnchors::fillChanged(void) ?fillColor@QDeclarativePaintedItem@@QBE?AVQColor@@XZ @ 1117 NONAME ; class QColor QDeclarativePaintedItem::fillColor(void) const ?fillColorChanged@QDeclarativePaintedItem@@IAEXXZ @ 1118 NONAME ; void QDeclarativePaintedItem::fillColorChanged(void) ?fillMode@QDeclarativeImage@@QBE?AW4FillMode@1@XZ @ 1119 NONAME ; enum QDeclarativeImage::FillMode QDeclarativeImage::fillMode(void) const ?fillModeChanged@QDeclarativeImage@@IAEXXZ @ 1120 NONAME ; void QDeclarativeImage::fillModeChanged(void) - ?findSignalByName@QDeclarativeCompiler@@SA?AVQMetaMethod@@PBUQMetaObject@@ABVQByteArray@@@Z @ 1121 NONAME ; class QMetaMethod QDeclarativeCompiler::findSignalByName(struct QMetaObject const *, class QByteArray const &) + ?findSignalByName@QDeclarativeCompiler@@SA?AVQMetaMethod@@PBUQMetaObject@@ABVQByteArray@@@Z @ 1121 NONAME ABSENT ; class QMetaMethod QDeclarativeCompiler::findSignalByName(struct QMetaObject const *, class QByteArray const &) ?findState@QDeclarativeStateGroup@@QBEPAVQDeclarativeState@@ABVQString@@@Z @ 1122 NONAME ; class QDeclarativeState * QDeclarativeStateGroup::findState(class QString const &) const ?finishApplyTransitions@QDeclarativeBasePositioner@@IAEXXZ @ 1123 NONAME ; void QDeclarativeBasePositioner::finishApplyTransitions(void) ?finished@QDeclarativePixmapReply@@IAEXXZ @ 1124 NONAME ; void QDeclarativePixmapReply::finished(void) @@ -2333,7 +2333,7 @@ EXPORTS ?setCached@QDeclarativeOpenMetaObject@@QAEX_N@Z @ 2332 NONAME ; void QDeclarativeOpenMetaObject::setCached(bool) ?setCellHeight@QDeclarativeGridView@@QAEXH@Z @ 2333 NONAME ; void QDeclarativeGridView::setCellHeight(int) ?setCellWidth@QDeclarativeGridView@@QAEXH@Z @ 2334 NONAME ; void QDeclarativeGridView::setCellWidth(int) - ?setCenterIn@QDeclarativeAnchors@@QAEXPAVQDeclarativeItem@@@Z @ 2335 NONAME ; void QDeclarativeAnchors::setCenterIn(class QDeclarativeItem *) + ?setCenterIn@QDeclarativeAnchors@@QAEXPAVQDeclarativeItem@@@Z @ 2335 NONAME ABSENT ; void QDeclarativeAnchors::setCenterIn(class QDeclarativeItem *) ?setClassName@QMetaObjectBuilder@@QAEXABVQByteArray@@@Z @ 2336 NONAME ; void QMetaObjectBuilder::setClassName(class QByteArray const &) ?setClip@QDeclarativeItem@@QAEX_N@Z @ 2337 NONAME ; void QDeclarativeItem::setClip(bool) ?setColor@QDeclarativeGradientStop@@QAEXABVQColor@@@Z @ 2338 NONAME ; void QDeclarativeGradientStop::setColor(class QColor const &) @@ -2411,7 +2411,7 @@ EXPORTS ?setExtends@QDeclarativeState@@QAEXABVQString@@@Z @ 2410 NONAME ; void QDeclarativeState::setExtends(class QString const &) ?setFadeInDuration@QDeclarativeParticles@@QAEXH@Z @ 2411 NONAME ABSENT ; void QDeclarativeParticles::setFadeInDuration(int) ?setFadeOutDuration@QDeclarativeParticles@@QAEXH@Z @ 2412 NONAME ABSENT ; void QDeclarativeParticles::setFadeOutDuration(int) - ?setFill@QDeclarativeAnchors@@QAEXPAVQDeclarativeItem@@@Z @ 2413 NONAME ; void QDeclarativeAnchors::setFill(class QDeclarativeItem *) + ?setFill@QDeclarativeAnchors@@QAEXPAVQDeclarativeItem@@@Z @ 2413 NONAME ABSENT ; void QDeclarativeAnchors::setFill(class QDeclarativeItem *) ?setFillColor@QDeclarativePaintedItem@@QAEXABVQColor@@@Z @ 2414 NONAME ; void QDeclarativePaintedItem::setFillColor(class QColor const &) ?setFillMode@QDeclarativeImage@@QAEXW4FillMode@1@@Z @ 2415 NONAME ; void QDeclarativeImage::setFillMode(enum QDeclarativeImage::FillMode) ?setFlags@QMetaObjectBuilder@@QAEXV?$QFlags@W4MetaObjectFlag@QMetaObjectBuilder@@@@@Z @ 2416 NONAME ; void QMetaObjectBuilder::setFlags(class QFlags) @@ -3543,13 +3543,13 @@ EXPORTS ?asString@Variant@QDeclarativeParser@@QBE?AVQString@@XZ @ 3542 NONAME ; class QString QDeclarativeParser::Variant::asString(void) const ?asStringList@Variant@QDeclarativeParser@@QBE?AVQStringList@@XZ @ 3543 NONAME ; class QStringList QDeclarativeParser::Variant::asStringList(void) const ?back@QDeclarativeFlipable@@QAEPAVQGraphicsObject@@XZ @ 3544 NONAME ; class QGraphicsObject * QDeclarativeFlipable::back(void) - ?baseline@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3545 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::baseline(void) const - ?baseline@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3546 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::baseline(void) const + ?baseline@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3545 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeAnchors::baseline(void) const + ?baseline@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3546 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeItem::baseline(void) const ?baselineOffsetChanged@QDeclarativeItem@@IAEXM@Z @ 3547 NONAME ; void QDeclarativeItem::baselineOffsetChanged(float) ?bindingIndex@QDeclarativePropertyPrivate@@SAHABVQDeclarativeProperty@@@Z @ 3548 NONAME ; int QDeclarativePropertyPrivate::bindingIndex(class QDeclarativeProperty const &) ?bindingType@QDeclarativeAbstractBinding@@UBE?AW4Type@1@XZ @ 3549 NONAME ; enum QDeclarativeAbstractBinding::Type QDeclarativeAbstractBinding::bindingType(void) const - ?bottom@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3550 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::bottom(void) const - ?bottom@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3551 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::bottom(void) const + ?bottom@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3550 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeAnchors::bottom(void) const + ?bottom@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3551 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeItem::bottom(void) const ?buildPropertyOnAssignment@QDeclarativeCompiler@@AAE_NPAVProperty@QDeclarativeParser@@PAVObject@3@1PAVValue@3@ABUBindingContext@1@@Z @ 3552 NONAME ; bool QDeclarativeCompiler::buildPropertyOnAssignment(class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, class QDeclarativeParser::Object *, class QDeclarativeParser::Value *, struct QDeclarativeCompiler::BindingContext const &) ?cacheBufferChanged@QDeclarativeGridView@@IAEXXZ @ 3553 NONAME ; void QDeclarativeGridView::cacheBufferChanged(void) ?cacheBufferChanged@QDeclarativeListView@@IAEXXZ @ 3554 NONAME ; void QDeclarativeListView::cacheBufferChanged(void) @@ -3608,7 +3608,7 @@ EXPORTS ?fromChanged@QDeclarativeTransition@@IAEXXZ @ 3607 NONAME ; void QDeclarativeTransition::fromChanged(void) ?front@QDeclarativeFlipable@@QAEPAVQGraphicsObject@@XZ @ 3608 NONAME ; class QGraphicsObject * QDeclarativeFlipable::front(void) ?geometryChanged@QDeclarativeFlickable@@MAEXABVQRectF@@0@Z @ 3609 NONAME ; void QDeclarativeFlickable::geometryChanged(class QRectF const &, class QRectF const &) - ?get@QDeclarativePixmapCache@@SA?AW4Status@QDeclarativePixmapReply@@ABVQUrl@@PAVQPixmap@@PAVQSize@@_NHH@Z @ 3610 NONAME ; enum QDeclarativePixmapReply::Status QDeclarativePixmapCache::get(class QUrl const &, class QPixmap *, class QSize *, bool, int, int) + ?get@QDeclarativePixmapCache@@SA?AW4Status@QDeclarativePixmapReply@@ABVQUrl@@PAVQPixmap@@PAVQSize@@_NHH@Z @ 3610 NONAME ABSENT ; enum QDeclarativePixmapReply::Status QDeclarativePixmapCache::get(class QUrl const &, class QPixmap *, class QSize *, bool, int, int) ?getStaticMetaObject@QDeclarativeSmoothedAnimation@@SAABUQMetaObject@@XZ @ 3611 NONAME ; struct QMetaObject const & QDeclarativeSmoothedAnimation::getStaticMetaObject(void) ?getStaticMetaObject@QDeclarativeTranslate@@SAABUQMetaObject@@XZ @ 3612 NONAME ; struct QMetaObject const & QDeclarativeTranslate::getStaticMetaObject(void) ?getStaticMetaObject@QDeclarativeWorkerScript@@SAABUQMetaObject@@XZ @ 3613 NONAME ; struct QMetaObject const & QDeclarativeWorkerScript::getStaticMetaObject(void) @@ -3626,8 +3626,8 @@ EXPORTS ?highlightRangeModeChanged@QDeclarativeGridView@@IAEXXZ @ 3625 NONAME ; void QDeclarativeGridView::highlightRangeModeChanged(void) ?highlightRangeModeChanged@QDeclarativeListView@@IAEXXZ @ 3626 NONAME ; void QDeclarativeListView::highlightRangeModeChanged(void) ?highlightRangeModeChanged@QDeclarativePathView@@IAEXXZ @ 3627 NONAME ; void QDeclarativePathView::highlightRangeModeChanged(void) - ?horizontalCenter@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3628 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::horizontalCenter(void) const - ?horizontalCenter@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3629 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::horizontalCenter(void) const + ?horizontalCenter@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3628 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeAnchors::horizontalCenter(void) const + ?horizontalCenter@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3629 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeItem::horizontalCenter(void) const ?idString@QDeclarativeDebugObjectReference@@QBE?AVQString@@XZ @ 3630 NONAME ; class QString QDeclarativeDebugObjectReference::idString(void) const ?implicitSize@QDeclarativePixmapReply@@QBE?AVQSize@@XZ @ 3631 NONAME ; class QSize QDeclarativePixmapReply::implicitSize(void) const ?importPathList@QDeclarativeEngine@@QBE?AVQStringList@@XZ @ 3632 NONAME ; class QStringList QDeclarativeEngine::importPathList(void) const @@ -3649,8 +3649,8 @@ EXPORTS ?itemsMoved@QDeclarativePathView@@AAEXHHH@Z @ 3648 NONAME ; void QDeclarativePathView::itemsMoved(int, int, int) ?keyNavigationWrapsChanged@QDeclarativeGridView@@IAEXXZ @ 3649 NONAME ; void QDeclarativeGridView::keyNavigationWrapsChanged(void) ?keyNavigationWrapsChanged@QDeclarativeListView@@IAEXXZ @ 3650 NONAME ; void QDeclarativeListView::keyNavigationWrapsChanged(void) - ?left@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3651 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::left(void) const - ?left@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3652 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::left(void) const + ?left@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3651 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeAnchors::left(void) const + ?left@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3652 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeItem::left(void) const ?mapFromItem@QDeclarativeItem@@QBE?AVQScriptValue@@ABV2@MM@Z @ 3653 NONAME ; class QScriptValue QDeclarativeItem::mapFromItem(class QScriptValue const &, float, float) const ?mapToItem@QDeclarativeItem@@QBE?AVQScriptValue@@ABV2@MM@Z @ 3654 NONAME ; class QScriptValue QDeclarativeItem::mapToItem(class QScriptValue const &, float, float) const ?maximumEasingTime@QDeclarativeSmoothedAnimation@@QBEHXZ @ 3655 NONAME ; int QDeclarativeSmoothedAnimation::maximumEasingTime(void) const @@ -3716,15 +3716,15 @@ EXPORTS ?reversibleChanged@QDeclarativeTransition@@IAEXXZ @ 3715 NONAME ; void QDeclarativeTransition::reversibleChanged(void) ?reversingMode@QDeclarativeSmoothedAnimation@@QBE?AW4ReversingMode@1@XZ @ 3716 NONAME ; enum QDeclarativeSmoothedAnimation::ReversingMode QDeclarativeSmoothedAnimation::reversingMode(void) const ?reversingModeChanged@QDeclarativeSmoothedAnimation@@IAEXXZ @ 3717 NONAME ; void QDeclarativeSmoothedAnimation::reversingModeChanged(void) - ?right@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3718 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::right(void) const - ?right@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3719 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::right(void) const + ?right@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3718 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeAnchors::right(void) const + ?right@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3719 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeItem::right(void) const ?roleObjects@QDeclarativeXmlListModel@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeXmlListModelRole@@@@XZ @ 3720 NONAME ; class QDeclarativeListProperty QDeclarativeXmlListModel::roleObjects(void) ?saveTargetValues@QDeclarativeAnchorChanges@@UAEXXZ @ 3721 NONAME ; void QDeclarativeAnchorChanges::saveTargetValues(void) ?sendMessage@QDeclarativeWorkerScript@@QAEXABVQScriptValue@@@Z @ 3722 NONAME ; void QDeclarativeWorkerScript::sendMessage(class QScriptValue const &) ?setBack@QDeclarativeFlipable@@QAEXPAVQGraphicsObject@@@Z @ 3723 NONAME ; void QDeclarativeFlipable::setBack(class QGraphicsObject *) - ?setBaseline@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3724 NONAME ; void QDeclarativeAnchors::setBaseline(struct QDeclarativeAnchorLine const &) + ?setBaseline@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3724 NONAME ABSENT ; void QDeclarativeAnchors::setBaseline(struct QDeclarativeAnchorLine const &) ?setBinding@QDeclarativePropertyPrivate@@SAPAVQDeclarativeAbstractBinding@@PAVQObject@@HHPAV2@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3725 NONAME ; class QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::setBinding(class QObject *, int, int, class QDeclarativeAbstractBinding *, class QFlags) - ?setBottom@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3726 NONAME ; void QDeclarativeAnchors::setBottom(struct QDeclarativeAnchorLine const &) + ?setBottom@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3726 NONAME ABSENT ; void QDeclarativeAnchors::setBottom(struct QDeclarativeAnchorLine const &) ?setContextObject@QDeclarativeContext@@QAEXPAVQObject@@@Z @ 3727 NONAME ; void QDeclarativeContext::setContextObject(class QObject *) ?setDuration@QDeclarativeSmoothedAnimation@@UAEXH@Z @ 3728 NONAME ; void QDeclarativeSmoothedAnimation::setDuration(int) ?setFlickDeceleration@QDeclarativePathView@@QAEXM@Z @ 3729 NONAME ; void QDeclarativePathView::setFlickDeceleration(float) @@ -3733,10 +3733,10 @@ EXPORTS ?setHighlight@QDeclarativePathView@@QAEXPAVQDeclarativeComponent@@@Z @ 3732 NONAME ; void QDeclarativePathView::setHighlight(class QDeclarativeComponent *) ?setHighlightRangeMode@QDeclarativeGridView@@QAEXW4HighlightRangeMode@1@@Z @ 3733 NONAME ; void QDeclarativeGridView::setHighlightRangeMode(enum QDeclarativeGridView::HighlightRangeMode) ?setHighlightRangeMode@QDeclarativePathView@@QAEXW4HighlightRangeMode@1@@Z @ 3734 NONAME ; void QDeclarativePathView::setHighlightRangeMode(enum QDeclarativePathView::HighlightRangeMode) - ?setHorizontalCenter@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3735 NONAME ; void QDeclarativeAnchors::setHorizontalCenter(struct QDeclarativeAnchorLine const &) + ?setHorizontalCenter@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3735 NONAME ABSENT ; void QDeclarativeAnchors::setHorizontalCenter(struct QDeclarativeAnchorLine const &) ?setImportPathList@QDeclarativeEngine@@QAEXABVQStringList@@@Z @ 3736 NONAME ; void QDeclarativeEngine::setImportPathList(class QStringList const &) ?setInteractive@QDeclarativePathView@@QAEX_N@Z @ 3737 NONAME ; void QDeclarativePathView::setInteractive(bool) - ?setLeft@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3738 NONAME ; void QDeclarativeAnchors::setLeft(struct QDeclarativeAnchorLine const &) + ?setLeft@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3738 NONAME ABSENT ; void QDeclarativeAnchors::setLeft(struct QDeclarativeAnchorLine const &) ?setMaximumEasingTime@QDeclarativeSmoothedAnimation@@QAEXH@Z @ 3739 NONAME ; void QDeclarativeSmoothedAnimation::setMaximumEasingTime(int) ?setObjectOwnership@QDeclarativeEngine@@SAXPAVQObject@@W4ObjectOwnership@1@@Z @ 3740 NONAME ; void QDeclarativeEngine::setObjectOwnership(class QObject *, enum QDeclarativeEngine::ObjectOwnership) ?setPosHelper@QDeclarativeItemPrivate@@UAEXABVQPointF@@@Z @ 3741 NONAME ; void QDeclarativeItemPrivate::setPosHelper(class QPointF const &) @@ -3745,15 +3745,15 @@ EXPORTS ?setPreferredHighlightEnd@QDeclarativeGridView@@QAEXM@Z @ 3744 NONAME ; void QDeclarativeGridView::setPreferredHighlightEnd(float) ?setPreferredHighlightEnd@QDeclarativePathView@@QAEXM@Z @ 3745 NONAME ; void QDeclarativePathView::setPreferredHighlightEnd(float) ?setReversingMode@QDeclarativeSmoothedAnimation@@QAEXW4ReversingMode@1@@Z @ 3746 NONAME ; void QDeclarativeSmoothedAnimation::setReversingMode(enum QDeclarativeSmoothedAnimation::ReversingMode) - ?setRight@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3747 NONAME ; void QDeclarativeAnchors::setRight(struct QDeclarativeAnchorLine const &) + ?setRight@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3747 NONAME ABSENT ; void QDeclarativeAnchors::setRight(struct QDeclarativeAnchorLine const &) ?setSize@QDeclarativeItem@@QAEXABVQSizeF@@@Z @ 3748 NONAME ; void QDeclarativeItem::setSize(class QSizeF const &) ?setSnapMode@QDeclarativeGridView@@QAEXW4SnapMode@1@@Z @ 3749 NONAME ; void QDeclarativeGridView::setSnapMode(enum QDeclarativeGridView::SnapMode) ?setSource@QDeclarativeWorkerScript@@QAEXABVQUrl@@@Z @ 3750 NONAME ; void QDeclarativeWorkerScript::setSource(class QUrl const &) ?setSourceSize@QDeclarativeImageBase@@QAEXABVQSize@@@Z @ 3751 NONAME ABSENT ; void QDeclarativeImageBase::setSourceSize(class QSize const &) ?setTarget@QDeclarativeDrag@@QAEXPAVQGraphicsObject@@@Z @ 3752 NONAME ; void QDeclarativeDrag::setTarget(class QGraphicsObject *) - ?setTop@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3753 NONAME ; void QDeclarativeAnchors::setTop(struct QDeclarativeAnchorLine const &) + ?setTop@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3753 NONAME ABSENT ; void QDeclarativeAnchors::setTop(struct QDeclarativeAnchorLine const &) ?setVelocity@QDeclarativeSmoothedAnimation@@QAEXM@Z @ 3754 NONAME ; void QDeclarativeSmoothedAnimation::setVelocity(float) - ?setVerticalCenter@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3755 NONAME ; void QDeclarativeAnchors::setVerticalCenter(struct QDeclarativeAnchorLine const &) + ?setVerticalCenter@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3755 NONAME ABSENT ; void QDeclarativeAnchors::setVerticalCenter(struct QDeclarativeAnchorLine const &) ?setWidth@QDeclarativeItemPrivate@@UAEXM@Z @ 3756 NONAME ; void QDeclarativeItemPrivate::setWidth(float) ?setX@QDeclarativeTranslate@@QAEXM@Z @ 3757 NONAME ; void QDeclarativeTranslate::setX(float) ?setY@QDeclarativeTranslate@@QAEXM@Z @ 3758 NONAME ; void QDeclarativeTranslate::setY(float) @@ -3779,8 +3779,8 @@ EXPORTS ?sync@QDeclarativeListModel@@QAEXXZ @ 3778 NONAME ; void QDeclarativeListModel::sync(void) ?target@QDeclarativeDrag@@QBEPAVQGraphicsObject@@XZ @ 3779 NONAME ; class QGraphicsObject * QDeclarativeDrag::target(void) const ?toChanged@QDeclarativeTransition@@IAEXXZ @ 3780 NONAME ; void QDeclarativeTransition::toChanged(void) - ?top@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3781 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::top(void) const - ?top@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3782 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::top(void) const + ?top@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3781 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeAnchors::top(void) const + ?top@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3782 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeItem::top(void) const ?tr@QDeclarativeSmoothedAnimation@@SA?AVQString@@PBD0@Z @ 3783 NONAME ; class QString QDeclarativeSmoothedAnimation::tr(char const *, char const *) ?tr@QDeclarativeSmoothedAnimation@@SA?AVQString@@PBD0H@Z @ 3784 NONAME ; class QString QDeclarativeSmoothedAnimation::tr(char const *, char const *, int) ?tr@QDeclarativeTranslate@@SA?AVQString@@PBD0@Z @ 3785 NONAME ; class QString QDeclarativeTranslate::tr(char const *, char const *) @@ -3806,8 +3806,8 @@ EXPORTS ?valueChanged@QDeclarativePropertyMap@@IAEXABVQString@@ABVQVariant@@@Z @ 3805 NONAME ; void QDeclarativePropertyMap::valueChanged(class QString const &, class QVariant const &) ?velocity@QDeclarativeSmoothedAnimation@@QBEMXZ @ 3806 NONAME ; float QDeclarativeSmoothedAnimation::velocity(void) const ?velocityChanged@QDeclarativeSmoothedAnimation@@IAEXXZ @ 3807 NONAME ; void QDeclarativeSmoothedAnimation::velocityChanged(void) - ?verticalCenter@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3808 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::verticalCenter(void) const - ?verticalCenter@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3809 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::verticalCenter(void) const + ?verticalCenter@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3808 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeAnchors::verticalCenter(void) const + ?verticalCenter@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3809 NONAME ABSENT ; struct QDeclarativeAnchorLine QDeclarativeItem::verticalCenter(void) const ?wantsFocusChanged@QDeclarativeItem@@IAEX_N@Z @ 3810 NONAME ; void QDeclarativeItem::wantsFocusChanged(bool) ?width@QDeclarativeItemPrivate@@UBEMXZ @ 3811 NONAME ; float QDeclarativeItemPrivate::width(void) const ?write@QDeclarativePropertyPrivate@@SA_NPAVQObject@@ABUData@QDeclarativePropertyCache@@ABVQVariant@@PAVQDeclarativeContextData@@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3812 NONAME ; bool QDeclarativePropertyPrivate::write(class QObject *, struct QDeclarativePropertyCache::Data const &, class QVariant const &, class QDeclarativeContextData *, class QFlags) @@ -3844,7 +3844,7 @@ EXPORTS ?highlightMoveDurationChanged@QDeclarativePathView@@IAEXXZ @ 3843 NONAME ; void QDeclarativePathView::highlightMoveDurationChanged(void) ?highlightResizeDuration@QDeclarativeListView@@QBEHXZ @ 3844 NONAME ; int QDeclarativeListView::highlightResizeDuration(void) const ?highlightResizeDurationChanged@QDeclarativeListView@@IAEXXZ @ 3845 NONAME ; void QDeclarativeListView::highlightResizeDurationChanged(void) - ?importPlugin@QDeclarativeEngine@@QAE_NABVQString@@0@Z @ 3846 NONAME ; bool QDeclarativeEngine::importPlugin(class QString const &, class QString const &) + ?importPlugin@QDeclarativeEngine@@QAE_NABVQString@@0@Z @ 3846 NONAME ABSENT ; bool QDeclarativeEngine::importPlugin(class QString const &, class QString const &) ?isExtendedType@QDeclarativeType@@QBE_NXZ @ 3847 NONAME ; bool QDeclarativeType::isExtendedType(void) const ?maximumEasingTime@QDeclarativeSmoothedFollow@@QBEHXZ @ 3848 NONAME ; int QDeclarativeSmoothedFollow::maximumEasingTime(void) const ?maximumEasingTimeChanged@QDeclarativeSmoothedFollow@@IAEXXZ @ 3849 NONAME ; void QDeclarativeSmoothedFollow::maximumEasingTimeChanged(void) @@ -3880,7 +3880,7 @@ EXPORTS ?sourceSizeChanged@QDeclarativeAnimatedImage@@IAEXXZ @ 3879 NONAME ; void QDeclarativeAnimatedImage::sourceSizeChanged(void) ?to@QDeclarativeSmoothedFollow@@QBEMXZ @ 3880 NONAME ; float QDeclarativeSmoothedFollow::to(void) const ?to@QDeclarativeSpringFollow@@QBEMXZ @ 3881 NONAME ; float QDeclarativeSpringFollow::to(void) const - ?tr@QDeclarativeCompiler@@AAE?AVQString@@PBD@Z @ 3882 NONAME ; class QString QDeclarativeCompiler::tr(char const *) + ?tr@QDeclarativeCompiler@@AAE?AVQString@@PBD@Z @ 3882 NONAME ABSENT ; class QString QDeclarativeCompiler::tr(char const *) ?tr@QDeclarativeSmoothedFollow@@SA?AVQString@@PBD0@Z @ 3883 NONAME ; class QString QDeclarativeSmoothedFollow::tr(char const *, char const *) ?tr@QDeclarativeSmoothedFollow@@SA?AVQString@@PBD0H@Z @ 3884 NONAME ; class QString QDeclarativeSmoothedFollow::tr(char const *, char const *, int) ?trUtf8@QDeclarativeSmoothedFollow@@SA?AVQString@@PBD0@Z @ 3885 NONAME ; class QString QDeclarativeSmoothedFollow::trUtf8(char const *, char const *) @@ -3893,4 +3893,28 @@ EXPORTS ?wrapModeChanged@QDeclarativeTextEdit@@IAEXXZ @ 3892 NONAME ; void QDeclarativeTextEdit::wrapModeChanged(void) ?xToPosition@QDeclarativeTextInput@@QAEHH@Z @ 3893 NONAME ; int QDeclarativeTextInput::xToPosition(int) ?staticMetaObject@QDeclarativeSmoothedFollow@@2UQMetaObject@@B @ 3894 NONAME ; struct QMetaObject const QDeclarativeSmoothedFollow::staticMetaObject + ?trUtf8@QDeclarativeCompiler@@SA?AVQString@@PBD0H@Z @ 3895 NONAME ; class QString QDeclarativeCompiler::trUtf8(char const *, char const *, int) + ?findSignalByName@QDeclarativePropertyPrivate@@SA?AVQMetaMethod@@PBUQMetaObject@@ABVQByteArray@@@Z @ 3896 NONAME ; class QMetaMethod QDeclarativePropertyPrivate::findSignalByName(struct QMetaObject const *, class QByteArray const &) + ?reloadWithResources@QDeclarativeText@@AAEXXZ @ 3897 NONAME ; void QDeclarativeText::reloadWithResources(void) + ?setFlow@QDeclarativeGrid@@QAEXW4Flow@1@@Z @ 3898 NONAME ; void QDeclarativeGrid::setFlow(enum QDeclarativeGrid::Flow) + ?fill@QDeclarativeAnchors@@QBEPAVQGraphicsObject@@XZ @ 3899 NONAME ; class QGraphicsObject * QDeclarativeAnchors::fill(void) const + ?get@QDeclarativePixmapCache@@SA?AW4Status@QDeclarativePixmapReply@@ABVQUrl@@PAVQPixmap@@PAVQString@@PAVQSize@@_NHH@Z @ 3900 NONAME ; enum QDeclarativePixmapReply::Status QDeclarativePixmapCache::get(class QUrl const &, class QPixmap *, class QString *, class QSize *, bool, int, int) + ?resourcesLoading@QDeclarativeText@@QBEHXZ @ 3901 NONAME ; int QDeclarativeText::resourcesLoading(void) const + ?trUtf8@QDeclarativeCompiler@@SA?AVQString@@PBD0@Z @ 3902 NONAME ; class QString QDeclarativeCompiler::trUtf8(char const *, char const *) + ?tr@QDeclarativePixmapCache@@SA?AVQString@@PBD0H@Z @ 3903 NONAME ; class QString QDeclarativePixmapCache::tr(char const *, char const *, int) + ?flow@QDeclarativeGrid@@QBE?AW4Flow@1@XZ @ 3904 NONAME ; enum QDeclarativeGrid::Flow QDeclarativeGrid::flow(void) const + ?trUtf8@QDeclarativePixmapCache@@SA?AVQString@@PBD0@Z @ 3905 NONAME ; class QString QDeclarativePixmapCache::trUtf8(char const *, char const *) + ?isValid@QDeclarativeContext@@QBE_NXZ @ 3906 NONAME ; bool QDeclarativeContext::isValid(void) const + ?tr@QDeclarativeCompiler@@SA?AVQString@@PBD0H@Z @ 3907 NONAME ; class QString QDeclarativeCompiler::tr(char const *, char const *, int) + ?flowChanged@QDeclarativeGrid@@IAEXXZ @ 3908 NONAME ; void QDeclarativeGrid::flowChanged(void) + ?qdeclarativeelement_destructor@QDeclarativePrivate@@YAXPAVQObject@@@Z @ 3909 NONAME ; void QDeclarativePrivate::qdeclarativeelement_destructor(class QObject *) + ?errorString@QDeclarativePixmapReply@@QBE?AVQString@@XZ @ 3910 NONAME ; class QString QDeclarativePixmapReply::errorString(void) const + ?tr@QDeclarativeCompiler@@SA?AVQString@@PBD0@Z @ 3911 NONAME ; class QString QDeclarativeCompiler::tr(char const *, char const *) + ?tr@QDeclarativePixmapCache@@SA?AVQString@@PBD0@Z @ 3912 NONAME ; class QString QDeclarativePixmapCache::tr(char const *, char const *) + ?centerIn@QDeclarativeAnchors@@QBEPAVQGraphicsObject@@XZ @ 3913 NONAME ; class QGraphicsObject * QDeclarativeAnchors::centerIn(void) const + ??0QDeclarativeAnchors@@QAE@PAVQGraphicsObject@@PAVQObject@@@Z @ 3914 NONAME ; QDeclarativeAnchors::QDeclarativeAnchors(class QGraphicsObject *, class QObject *) + ?importPlugin@QDeclarativeEngine@@QAE_NABVQString@@0PAV2@@Z @ 3915 NONAME ; bool QDeclarativeEngine::importPlugin(class QString const &, class QString const &, class QString *) + ?setFill@QDeclarativeAnchors@@QAEXPAVQGraphicsObject@@@Z @ 3916 NONAME ; void QDeclarativeAnchors::setFill(class QGraphicsObject *) + ?trUtf8@QDeclarativePixmapCache@@SA?AVQString@@PBD0H@Z @ 3917 NONAME ; class QString QDeclarativePixmapCache::trUtf8(char const *, char const *, int) + ?setCenterIn@QDeclarativeAnchors@@QAEXPAVQGraphicsObject@@@Z @ 3918 NONAME ; void QDeclarativeAnchors::setCenterIn(class QGraphicsObject *) diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index c34690e..a948f73 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12601,7 +12601,7 @@ EXPORTS ?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12600 NONAME ABSENT ; void QEglProperties::setPixelFormat(enum QImage::Format) ?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12601 NONAME ABSENT ; class QEglContext * QEglContext::currentContext(enum QEgl::API) ?errorString@QEglContext@@SA?AVQString@@H@Z @ 12602 NONAME ABSENT ; class QString QEglContext::errorString(int) - ?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12603 NONAME ; NONAME ; bool QFontDatabase::removeAllApplicationFonts() + ?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12603 NONAME ; bool QFontDatabase::removeAllApplicationFonts() ??0FileInfo@QZipReader@@QAE@XZ @ 12604 NONAME ; QZipReader::FileInfo::FileInfo(void) ??0QAbstractScrollAreaPrivate@@QAE@XZ @ 12605 NONAME ; QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate(void) ??0QGraphicsViewPrivate@@QAE@XZ @ 12606 NONAME ; QGraphicsViewPrivate::QGraphicsViewPrivate(void) @@ -12770,4 +12770,27 @@ EXPORTS ?children_append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12769 NONAME ; void QGraphicsItemPrivate::children_append(class QDeclarativeListProperty *, class QGraphicsObject *) ?children_at@QGraphicsItemPrivate@@SAPAVQGraphicsObject@@PAV?$QDeclarativeListProperty@VQGraphicsObject@@@@H@Z @ 12770 NONAME ; class QGraphicsObject * QGraphicsItemPrivate::children_at(class QDeclarativeListProperty *, int) ?children_count@QGraphicsItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@@Z @ 12771 NONAME ; int QGraphicsItemPrivate::children_count(class QDeclarativeListProperty *) + ?display@QEglContext@@QAEHXZ @ 12772 NONAME ABSENT ; int QEglContext::display(void) + ?defaultConfig@QEgl@@YAHHW4API@1@V?$QFlags@W4ConfigOption@QEgl@@@@@Z @ 12773 NONAME ABSENT ; int QEgl::defaultConfig(int, enum QEgl::API, class QFlags) + ?configAttrib@QEglContext@@QBEHH@Z @ 12774 NONAME ABSENT ; int QEglContext::configAttrib(int) const + ?error@QEgl@@YAHXZ @ 12775 NONAME ABSENT ; int QEgl::error(void) + ?errorString@QEgl@@YA?AVQString@@XZ @ 12776 NONAME ABSENT ; class QString QEgl::errorString(void) + ?configProperties@QEglContext@@QBE?AVQEglProperties@@XZ @ 12777 NONAME ABSENT ; class QEglProperties QEglContext::configProperties(void) const + ?extensions@QEgl@@YA?AVQString@@XZ @ 12778 NONAME ABSENT ; class QString QEgl::extensions(void) + ?nativePixmap@QEgl@@YAPAXPAVQPixmap@@@Z @ 12779 NONAME ABSENT ; void * QEgl::nativePixmap(class QPixmap *) + ?display@QEgl@@YAHXZ @ 12780 NONAME ABSENT ; int QEgl::display(void) + ?eglCreateImageKHR@QEgl@@YAHHHHHPBH@Z @ 12781 NONAME ABSENT ; int QEgl::eglCreateImageKHR(int, int, int, int, int const *) + ?hasExtension@QEgl@@YA_NPBD@Z @ 12782 NONAME ABSENT ; bool QEgl::hasExtension(char const *) + ?destroyContext@QEglContext@@QAEXXZ @ 12783 NONAME ABSENT ; void QEglContext::destroyContext(void) + ?nativeWindow@QEgl@@YAPAXPAVQWidget@@@Z @ 12784 NONAME ABSENT ; void * QEgl::nativeWindow(class QWidget *) + ?errorString@QEgl@@YA?AVQString@@H@Z @ 12785 NONAME ABSENT ; class QString QEgl::errorString(int) + ?chooseConfig@QEgl@@YAHPBVQEglProperties@@W4PixelFormatMatch@1@@Z @ 12786 NONAME ABSENT ; int QEgl::chooseConfig(class QEglProperties const *, enum QEgl::PixelFormatMatch) + ?eglDestroyImageKHR@QEgl@@YAHHH@Z @ 12787 NONAME ABSENT ; int QEgl::eglDestroyImageKHR(int, int) + ?isEmpty@QItemSelectionRange@@QBE_NXZ @ 12788 NONAME ; bool QItemSelectionRange::isEmpty(void) const + ?clearError@QEgl@@YAXXZ @ 12789 NONAME ABSENT ; void QEgl::clearError(void) + ?nativeDisplay@QEgl@@YAHXZ @ 12790 NONAME ABSENT ; int QEgl::nativeDisplay(void) + ?dumpAllConfigs@QEgl@@YAXXZ @ 12791 NONAME ABSENT ; void QEgl::dumpAllConfigs(void) + ?setDeviceType@QEglProperties@@QAEXH@Z @ 12792 NONAME ABSENT ; void QEglProperties::setDeviceType(int) + ?glyphPadding@QTextureGlyphCache@@UBEHXZ @ 12793 NONAME ; int QTextureGlyphCache::glyphPadding(void) const + ?createSurface@QEgl@@YAHPAVQPaintDevice@@HPBVQEglProperties@@@Z @ 12794 NONAME ABSENT ; int QEgl::createSurface(class QPaintDevice *, int, class QEglProperties const *) diff --git a/src/s60installs/bwins/QtOpenVGu.def b/src/s60installs/bwins/QtOpenVGu.def index 26ee862..b32406b 100644 --- a/src/s60installs/bwins/QtOpenVGu.def +++ b/src/s60installs/bwins/QtOpenVGu.def @@ -123,7 +123,7 @@ EXPORTS ?destroyPaintEngine@QVGEGLWindowSurfacePrivate@@IAEXXZ @ 122 NONAME ; void QVGEGLWindowSurfacePrivate::destroyPaintEngine(void) ?qt_vg_shared_surface@@YAHXZ @ 123 NONAME ; int qt_vg_shared_surface(void) ?drawCursorPixmap@QVGCompositionHelper@@QAEXABVQPixmap@@ABVQPoint@@@Z @ 124 NONAME ; void QVGCompositionHelper::drawCursorPixmap(class QPixmap const &, class QPoint const &) - ?drawPixmaps@QVGPaintEngine@@UAEXPBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 125 NONAME ; void QVGPaintEngine::drawPixmaps(struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags) + ?drawPixmaps@QVGPaintEngine@@UAEXPBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 125 NONAME ABSENT ; void QVGPaintEngine::drawPixmaps(struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags) ?drawPolygon@QVGPaintEngine@@UAEXPBVQPointF@@HW4PolygonDrawMode@QPaintEngine@@@Z @ 126 NONAME ; void QVGPaintEngine::drawPolygon(class QPointF const *, int, enum QPaintEngine::PolygonDrawMode) ?toVGImage@QVGPixmapData@@UAEKXZ @ 127 NONAME ; unsigned long QVGPixmapData::toVGImage(void) ?end@QVGPaintEngine@@UAE_NXZ @ 128 NONAME ; bool QVGPaintEngine::end(void) @@ -164,4 +164,7 @@ EXPORTS ?qt_vg_create_context@@YAPAVQEglContext@@PAVQPaintDevice@@H@Z @ 163 NONAME ; class QEglContext * qt_vg_create_context(class QPaintDevice *, int) ?reclaimImages@QVGPixmapData@@UAEXXZ @ 164 NONAME ; void QVGPixmapData::reclaimImages(void) ?hibernate@QVGPixmapData@@UAEXXZ @ 165 NONAME ; void QVGPixmapData::hibernate(void) + ?drawStaticTextItem@QVGPaintEngine@@UAEXPAVQStaticTextItem@@@Z @ 166 NONAME ; void QVGPaintEngine::drawStaticTextItem(class QStaticTextItem *) + ?drawPixmapFragments@QVGPaintEngine@@UAEXPBVPixmapFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 167 NONAME ; void QVGPaintEngine::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags) + ?drawCachedGlyphs@QVGPaintEngine@@QAE_NHPBIABVQFont@@PAVQFontEngine@@ABVQPointF@@@Z @ 168 NONAME ; bool QVGPaintEngine::drawCachedGlyphs(int, unsigned int const *, class QFont const &, class QFontEngine *, class QPointF const &) diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def index e54e03f..caeac8d 100644 --- a/src/s60installs/eabi/QtCoreu.def +++ b/src/s60installs/eabi/QtCoreu.def @@ -3693,6 +3693,8 @@ EXPORTS _ZN9QDateTime19fromMSecsSinceEpochEx @ 3692 NONAME _ZNK9QDateTime17toMSecsSinceEpochEv @ 3693 NONAME _ZN10QTextCodec11validCodecsEv @ 3694 NONAME - _ZN16QDeclarativeData13parentChangedE @ 3695 NONAME DATA 4 - _ZN16QDeclarativeData9destroyedE @ 3696 NONAME DATA 4 + _ZN16QDeclarativeData13parentChangedE @ 3695 NONAME DATA 4 ABSENT + _ZN16QDeclarativeData9destroyedE @ 3696 NONAME DATA 4 ABSENT + _ZN24QAbstractDeclarativeData13parentChangedE @ 3697 NONAME DATA 4 + _ZN24QAbstractDeclarativeData9destroyedE @ 3698 NONAME DATA 4 diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def index 0f0e886..7ad123d 100644 --- a/src/s60installs/eabi/QtDeclarativeu.def +++ b/src/s60installs/eabi/QtDeclarativeu.def @@ -431,7 +431,7 @@ EXPORTS _ZN19QDeclarativeAnchors11qt_metacastEPKc @ 430 NONAME _ZN19QDeclarativeAnchors11resetBottomEv @ 431 NONAME _ZN19QDeclarativeAnchors11setBaselineERK22QDeclarativeAnchorLine @ 432 NONAME - _ZN19QDeclarativeAnchors11setCenterInEP16QDeclarativeItem @ 433 NONAME + _ZN19QDeclarativeAnchors11setCenterInEP16QDeclarativeItem @ 433 NONAME ABSENT _ZN19QDeclarativeAnchors12rightChangedEv @ 434 NONAME _ZN19QDeclarativeAnchors12setTopMarginEf @ 435 NONAME _ZN19QDeclarativeAnchors13bottomChangedEv @ 436 NONAME @@ -463,16 +463,16 @@ EXPORTS _ZN19QDeclarativeAnchors27verticalCenterOffsetChangedEv @ 462 NONAME _ZN19QDeclarativeAnchors29horizontalCenterOffsetChangedEv @ 463 NONAME _ZN19QDeclarativeAnchors6setTopERK22QDeclarativeAnchorLine @ 464 NONAME - _ZN19QDeclarativeAnchors7setFillEP16QDeclarativeItem @ 465 NONAME + _ZN19QDeclarativeAnchors7setFillEP16QDeclarativeItem @ 465 NONAME ABSENT _ZN19QDeclarativeAnchors7setLeftERK22QDeclarativeAnchorLine @ 466 NONAME _ZN19QDeclarativeAnchors8resetTopEv @ 467 NONAME _ZN19QDeclarativeAnchors8setRightERK22QDeclarativeAnchorLine @ 468 NONAME _ZN19QDeclarativeAnchors9resetFillEv @ 469 NONAME _ZN19QDeclarativeAnchors9resetLeftEv @ 470 NONAME _ZN19QDeclarativeAnchors9setBottomERK22QDeclarativeAnchorLine @ 471 NONAME - _ZN19QDeclarativeAnchorsC1EP16QDeclarativeItemP7QObject @ 472 NONAME + _ZN19QDeclarativeAnchorsC1EP16QDeclarativeItemP7QObject @ 472 NONAME ABSENT _ZN19QDeclarativeAnchorsC1EP7QObject @ 473 NONAME - _ZN19QDeclarativeAnchorsC2EP16QDeclarativeItemP7QObject @ 474 NONAME + _ZN19QDeclarativeAnchorsC2EP16QDeclarativeItemP7QObject @ 474 NONAME ABSENT _ZN19QDeclarativeAnchorsC2EP7QObject @ 475 NONAME _ZN19QDeclarativeAnchorsD0Ev @ 476 NONAME _ZN19QDeclarativeAnchorsD1Ev @ 477 NONAME @@ -566,7 +566,7 @@ EXPORTS _ZN20QDeclarativeCompiler16buildDynamicMetaEPN18QDeclarativeParser6ObjectENS_15DynamicMetaModeE @ 565 NONAME _ZN20QDeclarativeCompiler16checkDynamicMetaEPN18QDeclarativeParser6ObjectE @ 566 NONAME _ZN20QDeclarativeCompiler16componentTypeRefEv @ 567 NONAME - _ZN20QDeclarativeCompiler16findSignalByNameEPK11QMetaObjectRK10QByteArray @ 568 NONAME + _ZN20QDeclarativeCompiler16findSignalByNameEPK11QMetaObjectRK10QByteArray @ 568 NONAME ABSENT _ZN20QDeclarativeCompiler16genValuePropertyEPN18QDeclarativeParser8PropertyEPNS0_6ObjectE @ 569 NONAME _ZN20QDeclarativeCompiler16genValueTypeDataEPN18QDeclarativeParser8PropertyES2_ @ 570 NONAME _ZN20QDeclarativeCompiler17buildListPropertyEPN18QDeclarativeParser8PropertyEPNS0_6ObjectERKNS_14BindingContextE @ 571 NONAME @@ -1511,7 +1511,7 @@ EXPORTS _ZN23QDeclarativePathPercent19getStaticMetaObjectEv @ 1510 NONAME _ZN23QDeclarativePathPercent8setValueEf @ 1511 NONAME _ZN23QDeclarativePixmapCache15pendingRequestsEv @ 1512 NONAME - _ZN23QDeclarativePixmapCache3getERK4QUrlP7QPixmapP5QSizebii @ 1513 NONAME + _ZN23QDeclarativePixmapCache3getERK4QUrlP7QPixmapP5QSizebii @ 1513 NONAME ABSENT _ZN23QDeclarativePixmapCache6cancelERK4QUrlP7QObject @ 1514 NONAME _ZN23QDeclarativePixmapCache7requestEP18QDeclarativeEngineRK4QUrlii @ 1515 NONAME _ZN23QDeclarativePixmapReply10setLoadingEv @ 1516 NONAME @@ -2874,7 +2874,7 @@ EXPORTS _ZNK28QDeclarativeCustomParserNode8locationEv @ 2873 NONAME _ZNK28QDeclarativeDebugObjectQuery10metaObjectEv @ 2874 NONAME _ZNK28QDeclarativeDebugObjectQuery6objectEv @ 2875 NONAME - _ZNK28QDeclarativeValueTypeFactoryixEi @ 2876 NONAME + _ZNK28QDeclarativeValueTypeFactoryixEi @ 2876 NONAME ABSENT _ZNK28QDeclarativeXmlListModelRole10metaObjectEv @ 2877 NONAME _ZNK29QDeclarativeDebugEnginesQuery10metaObjectEv @ 2878 NONAME _ZNK29QDeclarativeDebugEnginesQuery7enginesEv @ 2879 NONAME @@ -3399,10 +3399,10 @@ EXPORTS _ZN16QDeclarativeText15wrapModeChangedEv @ 3398 NONAME _ZN18QDeclarativeActionC1EP7QObjectRK7QStringP19QDeclarativeContextRK8QVariant @ 3399 NONAME _ZN18QDeclarativeActionC2EP7QObjectRK7QStringP19QDeclarativeContextRK8QVariant @ 3400 NONAME - _ZN18QDeclarativeEngine12importPluginERK7QStringS2_ @ 3401 NONAME + _ZN18QDeclarativeEngine12importPluginERK7QStringS2_ @ 3401 NONAME ABSENT _ZN18QDeclarativeEngine13addPluginPathERK7QString @ 3402 NONAME _ZN18QDeclarativeEngine17setPluginPathListERK11QStringList @ 3403 NONAME - _ZN20QDeclarativeCompiler2trEPKc @ 3404 NONAME + _ZN20QDeclarativeCompiler2trEPKc @ 3404 NONAME ABSENT _ZN20QDeclarativeGridView24setHighlightMoveDurationEi @ 3405 NONAME _ZN20QDeclarativeGridView28highlightMoveDurationChangedEv @ 3406 NONAME _ZN20QDeclarativeListView24setHighlightMoveDurationEi @ 3407 NONAME @@ -3471,4 +3471,19 @@ EXPORTS _ZThn8_N26QDeclarativeSmoothedFollow9setTargetERK20QDeclarativeProperty @ 3470 NONAME _ZThn8_N26QDeclarativeSmoothedFollowD0Ev @ 3471 NONAME _ZThn8_N26QDeclarativeSmoothedFollowD1Ev @ 3472 NONAME + _ZN16QDeclarativeGrid11flowChangedEv @ 3473 NONAME + _ZN16QDeclarativeGrid7setFlowENS_4FlowE @ 3474 NONAME + _ZN16QDeclarativeText19reloadWithResourcesEv @ 3475 NONAME + _ZN18QDeclarativeEngine12importPluginERK7QStringS2_PS0_ @ 3476 NONAME + _ZN19QDeclarativeAnchors11setCenterInEP15QGraphicsObject @ 3477 NONAME + _ZN19QDeclarativeAnchors7setFillEP15QGraphicsObject @ 3478 NONAME + _ZN19QDeclarativeAnchorsC1EP15QGraphicsObjectP7QObject @ 3479 NONAME + _ZN19QDeclarativeAnchorsC2EP15QGraphicsObjectP7QObject @ 3480 NONAME + _ZN19QDeclarativePrivate30qdeclarativeelement_destructorEP7QObject @ 3481 NONAME + _ZN23QDeclarativePixmapCache3getERK4QUrlP7QPixmapP7QStringP5QSizebii @ 3482 NONAME + _ZN27QDeclarativePropertyPrivate16findSignalByNameEPK11QMetaObjectRK10QByteArray @ 3483 NONAME + _ZNK16QDeclarativeGrid4flowEv @ 3484 NONAME + _ZNK16QDeclarativeText16resourcesLoadingEv @ 3485 NONAME + _ZNK19QDeclarativeContext7isValidEv @ 3486 NONAME + _ZNK23QDeclarativePixmapReply11errorStringEv @ 3487 NONAME diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 353603e..cadcf59 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -11973,4 +11973,25 @@ EXPORTS _ZN20QGraphicsItemPrivate11children_atEP24QDeclarativeListPropertyI15QGraphicsObjectEi @ 11972 NONAME _ZN20QGraphicsItemPrivate14children_countEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 11973 NONAME _ZN20QGraphicsItemPrivate15children_appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11974 NONAME + _ZN11QEglContext14destroyContextEv @ 11975 NONAME ABSENT + _ZN14QEglProperties13setDeviceTypeEi @ 11976 NONAME ABSENT + _ZN4QEgl10clearErrorEv @ 11977 NONAME ABSENT + _ZN4QEgl10extensionsEv @ 11978 NONAME ABSENT + _ZN4QEgl11errorStringEi @ 11979 NONAME ABSENT + _ZN4QEgl11errorStringEv @ 11980 NONAME ABSENT + _ZN4QEgl12chooseConfigEPK14QEglPropertiesNS_16PixelFormatMatchE @ 11981 NONAME ABSENT + _ZN4QEgl12hasExtensionEPKc @ 11982 NONAME ABSENT + _ZN4QEgl12nativePixmapEP7QPixmap @ 11983 NONAME ABSENT + _ZN4QEgl12nativeWindowEP7QWidget @ 11984 NONAME ABSENT + _ZN4QEgl13createSurfaceEP12QPaintDeviceiPK14QEglProperties @ 11985 NONAME ABSENT + _ZN4QEgl13defaultConfigEiNS_3APIE6QFlagsINS_12ConfigOptionEE @ 11986 NONAME ABSENT + _ZN4QEgl13nativeDisplayEv @ 11987 NONAME ABSENT + _ZN4QEgl14dumpAllConfigsEv @ 11988 NONAME ABSENT + _ZN4QEgl17eglCreateImageKHREiiiiPKi @ 11989 NONAME ABSENT + _ZN4QEgl18eglDestroyImageKHREii @ 11990 NONAME ABSENT + _ZN4QEgl5errorEv @ 11991 NONAME ABSENT + _ZN4QEgl7displayEv @ 11992 NONAME ABSENT + _ZNK11QEglContext12configAttribEi @ 11993 NONAME ABSENT + _ZNK11QEglContext16configPropertiesEv @ 11994 NONAME ABSENT + _ZNK19QItemSelectionRange7isEmptyEv @ 11995 NONAME diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def index eb4caef..cffc891 100644 --- a/src/s60installs/eabi/QtOpenVGu.def +++ b/src/s60installs/eabi/QtOpenVGu.def @@ -31,7 +31,7 @@ EXPORTS _ZN14QVGPaintEngine10penChangedEv @ 30 NONAME _ZN14QVGPaintEngine11drawEllipseERK5QRect @ 31 NONAME _ZN14QVGPaintEngine11drawEllipseERK6QRectF @ 32 NONAME - _ZN14QVGPaintEngine11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 33 NONAME + _ZN14QVGPaintEngine11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 33 NONAME ABSENT _ZN14QVGPaintEngine11drawPolygonEPK6QPointiN12QPaintEngine15PolygonDrawModeE @ 34 NONAME _ZN14QVGPaintEngine11drawPolygonEPK7QPointFiN12QPaintEngine15PolygonDrawModeE @ 35 NONAME _ZN14QVGPaintEngine12brushChangedEv @ 36 NONAME @@ -196,4 +196,7 @@ EXPORTS _ZN13QVGPixmapData19detachImageFromPoolEv @ 195 NONAME _ZTI12QVGImagePool @ 196 NONAME _ZTV12QVGImagePool @ 197 NONAME + _ZN14QVGPaintEngine16drawCachedGlyphsEiPKjRK5QFontP11QFontEngineRK7QPointF @ 198 NONAME + _ZN14QVGPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 199 NONAME + _ZN14QVGPaintEngine19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 200 NONAME -- cgit v0.12