Fix export symbols for QtDeclarative and QtQuick1.

Fix build on Windows and compiler warnings.

Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.

Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/declarative/items/context2d/qsgcanvasitem.cpp b/src/declarative/items/context2d/qsgcanvasitem.cpp
index 0bd9a47d8d..197a434921 100644
--- a/src/declarative/items/context2d/qsgcanvasitem.cpp
+++ b/src/declarative/items/context2d/qsgcanvasitem.cpp
@@ -264,7 +264,7 @@ QString QSGCanvasItem::toDataURL(const QString& mimeType) const
         image.save(&buffer, type.toAscii());
         buffer.close();
         QString dataUrl = QLatin1String("data:%1;base64,%2");
-        return dataUrl.arg(mime).arg(ba.toBase64().constData());
+        return dataUrl.arg(mime).arg(QString::fromAscii(ba.toBase64()));
     }
     return QLatin1String("data:,");
 }