8 files changed, 12 insertions, 9 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)
diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp
index 95ee95d0f7..9f55c400ce 100644
--- a/src/declarative/items/qsgcanvas.cpp
+++ b/src/declarative/items/qsgcanvas.cpp
@@ -252,7 +252,7 @@ void QSGCanvas::exposeEvent(QExposeEvent *)
     d->thread->paint();
 }
 
-void QSGCanvas::resizeEvent(QResizeEvent *e)
+void QSGCanvas::resizeEvent(QResizeEvent *)
 {
     Q_D(QSGCanvas);
     d->thread->resize(size());
@@ -268,7 +268,7 @@ void QSGCanvas::animationStopped()
     d_func()->thread->animationStopped();
 }
 
-void QSGCanvas::showEvent(QShowEvent *e)
+void QSGCanvas::showEvent(QShowEvent *)
 {
     Q_D(QSGCanvas);
     if (d->vsyncAnimations) {
@@ -286,7 +286,7 @@ void QSGCanvas::showEvent(QShowEvent *e)
     }
 }
 
-void QSGCanvas::hideEvent(QHideEvent *e)
+void QSGCanvas::hideEvent(QHideEvent *)
 {
     Q_D(QSGCanvas);
     d->thread->stopRendering();
diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp
index 9359906f25..9547dc01cc 100644
--- a/src/declarative/items/qsgitemsmodule.cpp
+++ b/src/declarative/items/qsgitemsmodule.cpp
@@ -126,7 +126,8 @@ static void qt_sgitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QDeclarativePathPercent>(uri,major,minor,"PathPercent");
     qmlRegisterType<QDeclarativePathQuad>(uri,major,minor,"PathQuad");
     qmlRegisterType<QSGPathView>(uri,major,minor,"PathView");
-    qmlRegisterUncreatableType<QSGBasePositioner>(uri,major,minor,"Positioner","Positioner is an abstract type that is only available as an attached property.");
+    qmlRegisterUncreatableType<QSGBasePositioner>(uri,major,minor,"Positioner",
+                                                  QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
 #ifndef QT_NO_VALIDATOR
     qmlRegisterType<QIntValidator>(uri,major,minor,"IntValidator");
     qmlRegisterType<QDoubleValidator>(uri,major,minor,"DoubleValidator");
diff --git a/src/declarative/items/qsgshadereffect.cpp b/src/declarative/items/qsgshadereffect.cpp
index b81e7f15af..7f7bff7719 100644
--- a/src/declarative/items/qsgshadereffect.cpp
+++ b/src/declarative/items/qsgshadereffect.cpp
@@ -417,7 +417,7 @@ void QSGShaderEffect::setSource(const QVariant &var, int index)
     QSGItem *item = qobject_cast<QSGItem *>(obj);
     if (!item || !item->isTextureProvider()) {
         qWarning("ShaderEffect: source uniform [%s] is not assigned a valid texture provider: %s [%s]",
-                 qPrintable(source.name), qPrintable(obj->objectName()), obj->metaObject()->className());
+                 source.name.constData(), qPrintable(obj->objectName()), obj->metaObject()->className());
         return;
     }
 
diff --git a/src/declarative/items/qsgtextedit.cpp b/src/declarative/items/qsgtextedit.cpp
index 1c0ed62f0d..cf861684fa 100644
--- a/src/declarative/items/qsgtextedit.cpp
+++ b/src/declarative/items/qsgtextedit.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 
-QWidgetPrivate *qt_widget_private(QWidget *widget);
+Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget);
 /*!
     \qmlclass TextEdit QSGTextEdit
     \inqmlmodule QtQuick 2
diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp
index d30faadb34..f6b8ecd436 100644
--- a/src/declarative/items/qsgtextinput.cpp
+++ b/src/declarative/items/qsgtextinput.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 
-QWidgetPrivate *qt_widget_private(QWidget *widget);
+Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget);
 
 /*!
     \qmlclass TextInput QSGTextInput