diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 16:43:22 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 17:02:05 +0200 |
commit | 01335edc94d2961bd4061ed2cb81ebd1151797bf (patch) | |
tree | 54df7d2d0857278198258e4d8a65bf63cb35d91a /src/declarative/items/context2d | |
parent | 20c3575fc39004d6a556820543982f4a6ebef0be (diff) |
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>
Diffstat (limited to 'src/declarative/items/context2d')
-rw-r--r-- | src/declarative/items/context2d/qsgcanvasitem.cpp | 2 | ||||
-rw-r--r-- | src/declarative/items/context2d/qsgcontext2d.cpp | 1 | ||||
-rw-r--r-- | src/declarative/items/context2d/qsgcontext2d_p_p.h | 3 |
3 files changed, 4 insertions, 2 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:,"); } diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp index 71bc7df980..22a9c7029e 100644 --- a/src/declarative/items/context2d/qsgcontext2d.cpp +++ b/src/declarative/items/context2d/qsgcontext2d.cpp @@ -546,6 +546,7 @@ static v8::Handle<v8::Value> ctx2d_valid(v8::Local<v8::String>, const v8::Access QV8Engine *engine = V8ENGINE_ACCESSOR(); + Q_UNUSED(engine) return v8::Boolean::New(r->context->valid()); } diff --git a/src/declarative/items/context2d/qsgcontext2d_p_p.h b/src/declarative/items/context2d/qsgcontext2d_p_p.h index d71a0bccf2..fc656f5f8f 100644 --- a/src/declarative/items/context2d/qsgcontext2d_p_p.h +++ b/src/declarative/items/context2d/qsgcontext2d_p_p.h @@ -58,7 +58,8 @@ QT_BEGIN_NAMESPACE class QSGCanvasItem; -struct QSGContext2DWorkerAgent { +class QSGContext2DWorkerAgent { +public: QSGContext2DWorkerAgent() :ref(1) , orig(0) |