Changeset 769 for trunk/src/svg

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/svg/qgraphicssvgitem.cpp (modified) (2 diffs)
• src/svg/qsvghandler.cpp (modified) (1 diff)

trunk/src/svg/qgraphicssvgitem.cpp

@@ -268 +268 @@
 /*!
   \property QGraphicsSvgItem::maximumCacheSize
+  \since 4.6
 
   This property holds the maximum size of the device coordinate cache
@@ -313 +314 @@
 /*!
   \property QGraphicsSvgItem::elementId
-
+  \since 4.6
+  
   This property holds the element's XML ID.
  */

trunk/src/svg/qsvghandler.cpp

@@ -75 +75 @@
 #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