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>

15 files changed, 64 insertions, 49 deletions

diff --git a/src/declarative/qml/ftw/qdeclarativepool_p.h b/src/declarative/qml/ftw/qdeclarativepool_p.h
index 8935046cc3..c4393fe2e6 100644
--- a/src/declarative/qml/ftw/qdeclarativepool_p.h
+++ b/src/declarative/qml/ftw/qdeclarativepool_p.h
@@ -58,7 +58,8 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativePool
+// Exported for QtQuick1
+class Q_DECLARATIVE_EXPORT QDeclarativePool
 {
 public:
     // The class has a destructor that needs to be called
diff --git a/src/declarative/qml/ftw/qfastmetabuilder_p.h b/src/declarative/qml/ftw/qfastmetabuilder_p.h
index 9a6971d652..e9457b5943 100644
--- a/src/declarative/qml/ftw/qfastmetabuilder_p.h
+++ b/src/declarative/qml/ftw/qfastmetabuilder_p.h
@@ -122,7 +122,7 @@ public:
     QByteArray toData() const { return m_data; }
     static void fromData(QMetaObject *, const QMetaObject *parent, const QByteArray &);
 private:
-    friend class StringRef;
+    friend struct StringRef;
 
     QByteArray m_data;
     int m_zeroPtr;
diff --git a/src/declarative/qml/ftw/qhashedstring_p.h b/src/declarative/qml/ftw/qhashedstring_p.h
index f6c7f20d3a..d0dada8d72 100644
--- a/src/declarative/qml/ftw/qhashedstring_p.h
+++ b/src/declarative/qml/ftw/qhashedstring_p.h
@@ -254,7 +254,7 @@ public:
     }
 };
 
-struct Q_AUTOTEST_EXPORT QStringHashData
+class Q_AUTOTEST_EXPORT QStringHashData
 {
 public:
     QStringHashData() 
@@ -275,7 +275,7 @@ private:
 };
 
 template<class T, int SmallThreshold = 0>
-class Q_AUTOTEST_EXPORT QStringHash
+class QStringHash
 {
 public:
     struct Node : public QStringHashNode {
diff --git a/src/declarative/qml/qdeclarativecleanup_p.h b/src/declarative/qml/qdeclarativecleanup_p.h
index 3f55bdbe48..1efe564edc 100644
--- a/src/declarative/qml/qdeclarativecleanup_p.h
+++ b/src/declarative/qml/qdeclarativecleanup_p.h
@@ -58,7 +58,9 @@
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeEngine;
-class QDeclarativeCleanup
+
+// Exported for QtQuick1
+class Q_DECLARATIVE_EXPORT QDeclarativeCleanup
 {
 public:
     QDeclarativeCleanup(QDeclarativeEngine *);
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 79094b7e0e..b3d714dcb2 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1595,7 +1595,7 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeScript::Property *prop,
             QDeclarativePropertyCache::Data defaultPropertyData;
             defaultPropertyData.load(p, engine);
             if (p.name())
-                prop->setName(p.name());
+                prop->setName(QLatin1String(p.name()));
             prop->core = defaultPropertyData;
             prop->index = prop->core.coreIndex;
         }
@@ -2406,7 +2406,7 @@ const QMetaObject *QDeclarativeCompiler::resolveType(const QByteArray& name) con
 int QDeclarativeCompiler::rewriteBinding(const QString& expression, const QString& name)
 {
     QDeclarativeRewrite::RewriteBinding rewriteBinding;
-    rewriteBinding.setName(QLatin1Char('$') + name.mid(name.lastIndexOf('.') + 1));
+    rewriteBinding.setName(QLatin1Char('$') + name.mid(name.lastIndexOf(QLatin1Char('.')) + 1));
 
     QString rewrite = rewriteBinding(expression, 0, 0);
 
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index 0c0719a710..64bdaf108a 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -210,7 +210,7 @@ void QDeclarativeImports::populateCache(QDeclarativeTypeNameCache *cache, QDecla
             if (module)
                 import.modules.append(QDeclarativeTypeModuleVersion(module, data.minversion));
 
-            QDeclarativeMetaType::ModuleApi moduleApi = QDeclarativeMetaType::moduleApi(data.uri.toUtf8(), data.majversion, data.minversion);
+            QDeclarativeMetaType::ModuleApi moduleApi = QDeclarativeMetaType::moduleApi(data.uri, data.majversion, data.minversion);
             if (moduleApi.script || moduleApi.qobject) {
                 QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
                 QDeclarativeMetaType::ModuleApiInstance *a = ep->moduleApiInstances.value(moduleApi);
diff --git a/src/declarative/qml/qdeclarativeimport_p.h b/src/declarative/qml/qdeclarativeimport_p.h
index c695a6b423..7f0b499881 100644
--- a/src/declarative/qml/qdeclarativeimport_p.h
+++ b/src/declarative/qml/qdeclarativeimport_p.h
@@ -71,7 +71,8 @@ class QDeclarativeImportsPrivate;
 class QDeclarativeImportDatabase;
 class QDeclarativeTypeLoader;
 
-class QDeclarativeImports
+// Exported for QtQuick1
+class Q_DECLARATIVE_EXPORT QDeclarativeImports
 {
 public:
     QDeclarativeImports(QDeclarativeTypeLoader *);
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index e2f728ad69..995a6b9ad7 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -132,7 +132,8 @@ QDeclarativeInfo::~QDeclarativeInfo()
 
                     marker = typeName.indexOf(QLatin1String("_QML_"));
                     if (marker != -1) {
-                        typeName = typeName.left(marker) + "*";
+                        typeName = typeName.left(marker);
+                        typeName += QLatin1Char('*');
                         type = QDeclarativeMetaType::qmlType(QMetaType::type(typeName.toLatin1()));
                         if (type) {
                             typeName = QLatin1String(type->qmlTypeName());
diff --git a/src/declarative/qml/qdeclarativescript_p.h b/src/declarative/qml/qdeclarativescript_p.h
index 3aff31789a..a985fd7a8a 100644
--- a/src/declarative/qml/qdeclarativescript_p.h
+++ b/src/declarative/qml/qdeclarativescript_p.h
@@ -72,7 +72,7 @@ QT_MODULE(Declarative)
 class QByteArray;
 class QDeclarativePropertyCache;
 namespace QDeclarativeJS { namespace AST { class Node; class StringLiteral; } }
-namespace QDeclarativeCompilerTypes { class BindingReference; class ComponentCompileState; }
+namespace QDeclarativeCompilerTypes { struct BindingReference; struct ComponentCompileState; }
 
 namespace QDeclarativeScript {
 
diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp
index fbe5b95aeb..687aec9448 100644
--- a/src/declarative/qml/qdeclarativesqldatabase.cpp
+++ b/src/declarative/qml/qdeclarativesqldatabase.cpp
@@ -145,7 +145,7 @@ public:
     bool forwardOnly; // type == Rows
 };
 
-static v8::Handle<v8::Value> qmlsqldatabase_version(v8::Local<v8::String> property, const v8::AccessorInfo& info)
+static v8::Handle<v8::Value> qmlsqldatabase_version(v8::Local<v8::String> /* property */, const v8::AccessorInfo& info)
 {
     QV8SqlDatabaseResource *r = v8_resource_cast<QV8SqlDatabaseResource>(info.This());
     if (!r || r->type != QV8SqlDatabaseResource::Database)
@@ -154,7 +154,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_version(v8::Local<v8::String> proper
     return r->engine->toString(r->version);
 }
 
-static v8::Handle<v8::Value> qmlsqldatabase_rows_length(v8::Local<v8::String> property, const v8::AccessorInfo& info)
+static v8::Handle<v8::Value> qmlsqldatabase_rows_length(v8::Local<v8::String> /* property */, const v8::AccessorInfo& info)
 {
     QV8SqlDatabaseResource *r = v8_resource_cast<QV8SqlDatabaseResource>(info.This());
     if (!r || r->type != QV8SqlDatabaseResource::Rows)
@@ -172,7 +172,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_rows_length(v8::Local<v8::String> pr
     return v8::Integer::New(s);
 }
 
-static v8::Handle<v8::Value> qmlsqldatabase_rows_forwardOnly(v8::Local<v8::String> property, 
+static v8::Handle<v8::Value> qmlsqldatabase_rows_forwardOnly(v8::Local<v8::String> /* property */,
                                                              const v8::AccessorInfo& info)
 {
     QV8SqlDatabaseResource *r = v8_resource_cast<QV8SqlDatabaseResource>(info.This());
@@ -182,7 +182,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_rows_forwardOnly(v8::Local<v8::Strin
     return v8::Boolean::New(r->query.isForwardOnly());
 }
 
-static void qmlsqldatabase_rows_setForwardOnly(v8::Local<v8::String> property,
+static void qmlsqldatabase_rows_setForwardOnly(v8::Local<v8::String> /* property */,
                                                v8::Local<v8::Value> value,
                                                const v8::AccessorInfo& info)
 {
@@ -568,7 +568,7 @@ void *qt_add_qmlsqldatabase(QV8Engine *engine)
     return (void *)new QDeclarativeSqlDatabaseData(engine);
 }
 
-void qt_rem_qmlsqldatabase(QV8Engine *engine, void *d)
+void qt_rem_qmlsqldatabase(QV8Engine * /* engine */, void *d)
 {
     QDeclarativeSqlDatabaseData *data = (QDeclarativeSqlDatabaseData *)d;
     delete data;
diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h
index 349a9f8428..af1a2f731e 100644
--- a/src/declarative/qml/qdeclarativetypeloader_p.h
+++ b/src/declarative/qml/qdeclarativetypeloader_p.h
@@ -77,7 +77,8 @@ class QDeclarativeComponentPrivate;
 class QDeclarativeTypeData;
 class QDeclarativeDataLoader;
 
-class Q_AUTOTEST_EXPORT QDeclarativeDataBlob : public QDeclarativeRefCount
+// Exported for QtQuick1
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDataBlob : public QDeclarativeRefCount
 {
 public:
     enum Status {
@@ -160,7 +161,8 @@ private:
     QList<QDeclarativeError> m_errors;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeDataLoader : public QObject
+// Exported for QtQuick1
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDataLoader : public QObject
 {
     Q_OBJECT
 public:
@@ -184,7 +186,8 @@ private:
     NetworkReplies m_networkReplies;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeTypeLoader : public QDeclarativeDataLoader
+// Exported for QtQuick1
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeTypeLoader : public QDeclarativeDataLoader
 {
     Q_OBJECT
 public:
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index 03cb83fdad..41d5e7cb8f 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -105,7 +105,8 @@ private:
     QDeclarativeValueType *valueTypes[QVariant::UserType - 1]; 
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePointFValueType : public QDeclarativeValueType
+// Exported for QtQuick1
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePointFValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(qreal x READ x WRITE setX)
     Q_PROPERTY(qreal y READ y WRITE setY)
@@ -129,7 +130,8 @@ private:
     QPointF point;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePointValueType : public QDeclarativeValueType
+// Exported for QtQuick1
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePointValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(int x READ x WRITE setX)
     Q_PROPERTY(int y READ y WRITE setY)
@@ -153,7 +155,8 @@ private:
     QPoint point;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeSizeFValueType : public QDeclarativeValueType
+// Exported for QtQuick1
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeSizeFValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(qreal width READ width WRITE setWidth)
     Q_PROPERTY(qreal height READ height WRITE setHeight)
@@ -177,7 +180,8 @@ private:
     QSizeF size;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeSizeValueType : public QDeclarativeValueType
+// Exported for QtQuick1
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeSizeValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(int width READ width WRITE setWidth)
     Q_PROPERTY(int height READ height WRITE setHeight)
@@ -201,7 +205,8 @@ private:
     QSize size;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeRectFValueType : public QDeclarativeValueType
+// Exported for QtQuick1
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeRectFValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(qreal x READ x WRITE setX)
     Q_PROPERTY(qreal y READ y WRITE setY)
@@ -232,7 +237,8 @@ private:
     QRectF rect;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeRectValueType : public QDeclarativeValueType
+// Exported for QtQuick1
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeRectValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(int x READ x WRITE setX)
     Q_PROPERTY(int y READ y WRITE setY)
@@ -263,7 +269,7 @@ private:
     QRect rect;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeVector2DValueType : public QDeclarativeValueType
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeVector2DValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(qreal x READ x WRITE setX)
     Q_PROPERTY(qreal y READ y WRITE setY)
@@ -287,7 +293,7 @@ private:
     QVector2D vector;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeVector3DValueType : public QDeclarativeValueType
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeVector3DValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(qreal x READ x WRITE setX)
     Q_PROPERTY(qreal y READ y WRITE setY)
@@ -314,7 +320,7 @@ private:
     QVector3D vector;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeVector4DValueType : public QDeclarativeValueType
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeVector4DValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(qreal x READ x WRITE setX)
     Q_PROPERTY(qreal y READ y WRITE setY)
@@ -344,7 +350,7 @@ private:
     QVector4D vector;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeQuaternionValueType : public QDeclarativeValueType
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeQuaternionValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(qreal scalar READ scalar WRITE setScalar)
     Q_PROPERTY(qreal x READ x WRITE setX)
@@ -374,7 +380,7 @@ private:
     QQuaternion quaternion;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeMatrix4x4ValueType : public QDeclarativeValueType
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeMatrix4x4ValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(qreal m11 READ m11 WRITE setM11)
     Q_PROPERTY(qreal m12 READ m12 WRITE setM12)
@@ -441,7 +447,7 @@ private:
     QMatrix4x4 matrix;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeEasingValueType : public QDeclarativeValueType
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEasingValueType : public QDeclarativeValueType
 {
     Q_OBJECT
     Q_ENUMS(Type)
@@ -499,7 +505,7 @@ private:
     QEasingCurve easing;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeFontValueType : public QDeclarativeValueType
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeFontValueType : public QDeclarativeValueType
 {
     Q_OBJECT
     Q_ENUMS(FontWeight)
@@ -582,7 +588,7 @@ private:
     mutable QDeclarativeNullableValue<int> dpi;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeColorValueType : public QDeclarativeValueType
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeColorValueType : public QDeclarativeValueType
 {
     Q_PROPERTY(qreal r READ r WRITE setR)
     Q_PROPERTY(qreal g READ g WRITE setG)
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index 0eb923a70c..23f21c91e3 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -613,7 +613,7 @@ v8::Handle<v8::Value> CharacterData::length(v8::Local<v8::String>, const v8::Acc
     QDeclarativeDOMNodeResource *r = v8_resource_cast<QDeclarativeDOMNodeResource>(args.This());
     if (!r) return v8::Undefined();
     QV8Engine *engine = V8ENGINE();
-
+    Q_UNUSED(engine)
     return v8::Integer::New(r->d->data.length());
 }
 
@@ -637,7 +637,7 @@ v8::Handle<v8::Value> Text::isElementContentWhitespace(v8::Local<v8::String>, co
     QDeclarativeDOMNodeResource *r = v8_resource_cast<QDeclarativeDOMNodeResource>(args.This());
     if (!r) return v8::Undefined();
     QV8Engine *engine = V8ENGINE();
-
+    Q_UNUSED(engine)
     return v8::Boolean::New(r->d->data.trimmed().isEmpty());
 }
 
@@ -810,7 +810,7 @@ v8::Handle<v8::Value> NamedNodeMap::length(v8::Local<v8::String>, const v8::Acce
     QDeclarativeDOMNodeResource *r = v8_resource_cast<QDeclarativeDOMNodeResource>(args.This());
     if (!r) return v8::Undefined();
     QV8Engine *engine = V8ENGINE();
-
+    Q_UNUSED(engine)
     return v8::Integer::New(r->list->count());
 }
 
@@ -888,7 +888,7 @@ v8::Handle<v8::Value> NodeList::length(v8::Local<v8::String>, const v8::Accessor
     QDeclarativeDOMNodeResource *r = v8_resource_cast<QDeclarativeDOMNodeResource>(args.This());
     if (!r) return v8::Undefined();
     QV8Engine *engine = V8ENGINE();
-
+    Q_UNUSED(engine)
     return v8::Integer::New(r->d->children.count());
 }
 
@@ -931,7 +931,7 @@ v8::Handle<v8::Value> Document::xmlStandalone(v8::Local<v8::String>, const v8::A
     QDeclarativeDOMNodeResource *r = v8_resource_cast<QDeclarativeDOMNodeResource>(args.This());
     if (!r || r->d->type != NodeImpl::Document) return v8::Undefined();
     QV8Engine *engine = V8ENGINE();
-
+    Q_UNUSED(engine)
     return v8::Boolean::New(static_cast<DocumentImpl *>(r->d)->isStandalone);
 }
 
@@ -1646,7 +1646,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_getAllResponseHeaders(const v8::A
 }
 
 // XMLHttpRequest properties
-static v8::Handle<v8::Value> qmlxmlhttprequest_readyState(v8::Local<v8::String> property,
+static v8::Handle<v8::Value> qmlxmlhttprequest_readyState(v8::Local<v8::String> /* property */,
                                                           const v8::AccessorInfo& info)
 {
     QDeclarativeXMLHttpRequest *r = v8_resource_cast<QDeclarativeXMLHttpRequest>(info.This());
@@ -1656,7 +1656,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_readyState(v8::Local<v8::String>
     return v8::Integer::NewFromUnsigned(r->readyState());
 }
 
-static v8::Handle<v8::Value> qmlxmlhttprequest_status(v8::Local<v8::String> property,
+static v8::Handle<v8::Value> qmlxmlhttprequest_status(v8::Local<v8::String> /* property */,
                                                       const v8::AccessorInfo& info)
 {
     QDeclarativeXMLHttpRequest *r = v8_resource_cast<QDeclarativeXMLHttpRequest>(info.This());
@@ -1673,7 +1673,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_status(v8::Local<v8::String> prop
         return v8::Integer::New(r->replyStatus());
 }
 
-static v8::Handle<v8::Value> qmlxmlhttprequest_statusText(v8::Local<v8::String> property,
+static v8::Handle<v8::Value> qmlxmlhttprequest_statusText(v8::Local<v8::String> /* property */,
                                                           const v8::AccessorInfo& info)
 {
     QDeclarativeXMLHttpRequest *r = v8_resource_cast<QDeclarativeXMLHttpRequest>(info.This());
@@ -1692,7 +1692,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_statusText(v8::Local<v8::String>
         return engine->toString(r->replyStatusText());
 }
 
-static v8::Handle<v8::Value> qmlxmlhttprequest_responseText(v8::Local<v8::String> property,
+static v8::Handle<v8::Value> qmlxmlhttprequest_responseText(v8::Local<v8::String> /* property */,
                                                             const v8::AccessorInfo& info)
 {
     QDeclarativeXMLHttpRequest *r = v8_resource_cast<QDeclarativeXMLHttpRequest>(info.This());
@@ -1708,8 +1708,8 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_responseText(v8::Local<v8::String
         return engine->toString(r->responseBody());
 }
 
-static v8::Handle<v8::Value> qmlxmlhttprequest_responseXML(v8::Local<v8::String> property,
-                                                            const v8::AccessorInfo& info)
+static v8::Handle<v8::Value> qmlxmlhttprequest_responseXML(v8::Local<v8::String> /* property */,
+                                                           const v8::AccessorInfo& info)
 {
     QDeclarativeXMLHttpRequest *r = v8_resource_cast<QDeclarativeXMLHttpRequest>(info.This());
     if (!r)
@@ -1729,7 +1729,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_new(const v8::Arguments &args)
     if (args.IsConstructCall()) {
         QV8Engine *engine = V8ENGINE();
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine->engine());
-
+        Q_UNUSED(ep)
         QDeclarativeXMLHttpRequest *r = new QDeclarativeXMLHttpRequest(engine, engine->networkAccessManager());
         args.This()->SetExternalResource(r);
 
@@ -1741,7 +1741,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_new(const v8::Arguments &args)
 
 #define NEWFUNCTION(function) v8::FunctionTemplate::New(function)->GetFunction()
 
-void qt_rem_qmlxmlhttprequest(QV8Engine *engine, void *d)
+void qt_rem_qmlxmlhttprequest(QV8Engine * /* engine */, void *d)
 {
     QDeclarativeXMLHttpRequestData *data = (QDeclarativeXMLHttpRequestData *)d;
     delete data;
diff --git a/src/declarative/qml/v8/qv8qobjectwrapper.cpp b/src/declarative/qml/v8/qv8qobjectwrapper.cpp
index 52e106494c..46494daf55 100644
--- a/src/declarative/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/declarative/qml/v8/qv8qobjectwrapper.cpp
@@ -1018,8 +1018,9 @@ QPair<QObject *, int> QV8QObjectWrapper::ExtractQtMethod(QV8Engine *engine, v8::
     return qMakePair((QObject *)0, -1);
 }
 
-struct QV8QObjectConnectionList : public QObject, public QDeclarativeGuard<QObject>
+class QV8QObjectConnectionList : public QObject, public QDeclarativeGuard<QObject>
 {
+public:
     QV8QObjectConnectionList(QObject *object, QV8Engine *engine);
     ~QV8QObjectConnectionList();
 
diff --git a/src/declarative/qml/v8/qv8variantwrapper.cpp b/src/declarative/qml/v8/qv8variantwrapper.cpp
index de4f0ce2d7..4b2acfc965 100644
--- a/src/declarative/qml/v8/qv8variantwrapper.cpp
+++ b/src/declarative/qml/v8/qv8variantwrapper.cpp
@@ -166,13 +166,13 @@ QVariant &QV8VariantWrapper::variantValue(v8::Handle<v8::Value> value)
     return static_cast<QV8VariantResource *>(r)->data;
 }
 
-v8::Handle<v8::Value> QV8VariantWrapper::Getter(v8::Local<v8::String> property,
+v8::Handle<v8::Value> QV8VariantWrapper::Getter(v8::Local<v8::String> /* property */,
                                                 const v8::AccessorInfo &info)
 {
     return v8::Handle<v8::Value>();
 }
 
-v8::Handle<v8::Value> QV8VariantWrapper::Setter(v8::Local<v8::String> property, 
+v8::Handle<v8::Value> QV8VariantWrapper::Setter(v8::Local<v8::String> /* property */,
                                                 v8::Local<v8::Value> value,
                                                 const v8::AccessorInfo &info)
 {