summaryrefslogtreecommitdiffstats
path: root/src/s60installs/eabi
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-12 17:42:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-12 17:42:55 (GMT)
commit161e4c77b35a7cc4dda5b83b212fedaa02c46cdf (patch)
tree3728674860306f7a1ae0c4e75f35352af5f49ca9 /src/s60installs/eabi
parent47760d59d57f548d5816ae43e456c86e01146491 (diff)
parent770a2428357f030d4efad8c64ceb381ce50c9fb9 (diff)
downloadQt-161e4c77b35a7cc4dda5b83b212fedaa02c46cdf.zip
Qt-161e4c77b35a7cc4dda5b83b212fedaa02c46cdf.tar.gz
Qt-161e4c77b35a7cc4dda5b83b212fedaa02c46cdf.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits) Compile fix on Windows. Remove an unnecessary assert. Documentation for the Pad Navigator Example. New Pad Nagivator example implementation. Skip definition of wintab functions in case of QT_NO_TABLETEVENT. Made curve tesselation be dynamically adjusted based on transform. Modified QPainter and QPixmap benchmarks to use raster pixmaps. Stabilize tst_QWidgetAction::visibilityUpdate Fix compiler warning in QT_REQUIRE_VERSION Stabilize tst_QColumnView::parentCurrentIndex Really fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux Fix typos in Elastic Nodes example documentation. Made paint engine texture drawing work in GL ES 2 and updated docs. Opt out of visual-config size checks with extension Fix off-by-one in text layouts and widget size hints on Mac Stabilize tst_QDockWidget::taskQTBUG_9758_undockedGeometry Mark QFileDialog::Options as a Q_FLAGS fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux Fixed scrolling bugs in widget graphics effect backend. Fixed source pixmap bug in widget graphics effect backend. ...
Diffstat (limited to 'src/s60installs/eabi')
-rw-r--r--src/s60installs/eabi/QtGuiu.def4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 8987470..02b74ee 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -9901,9 +9901,9 @@ EXPORTS
_ZNK7QBezier10addIfCloseEPff @ 9900 NONAME
_ZNK7QBezier12addToPolygonEP9QPolygonF @ 9901 NONAME
_ZNK7QBezier16bezierOnIntervalEff @ 9902 NONAME
- _ZNK7QBezier17addToPolygonMixedEP9QPolygonF @ 9903 NONAME
+ _ZNK7QBezier17addToPolygonMixedEP9QPolygonF @ 9903 NONAME ABSENT
_ZNK7QBezier17stationaryYPointsERfS0_ @ 9904 NONAME
- _ZNK7QBezier21addToPolygonIterativeEP9QPolygonF @ 9905 NONAME
+ _ZNK7QBezier21addToPolygonIterativeEP9QPolygonF @ 9905 NONAME ABSENT
_ZNK7QBezier5tForYEfff @ 9906 NONAME
_ZNK7QBezier6boundsEv @ 9907 NONAME
_ZNK7QBezier6lengthEf @ 9908 NONAME