diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-06 10:44:16 +0100 |
---|---|---|
committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-07 02:35:18 +0100 |
commit | 8d0664c53177d0c823a66239858a101524595c7e (patch) | |
tree | e2ef6bc4441e4721e926bd3e8d4252cfc254ca7c /src/declarative | |
parent | ca1008b7d85670aa069fb1ef5cb89db35b1cd1b6 (diff) |
QtQuick1: Fix compilation on Windows.
- Add missing modules, includes.
- Fix warnings.
Change-Id: I21a6107db6c5978ccfd59c4202cf31e3deba19ca
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/declarative')
7 files changed, 5 insertions, 6 deletions
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp index dbdde774..6670b8d3 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp +++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp @@ -87,6 +87,7 @@ void QDeclarativeInspectorService::sendMessage(const QByteArray &message) void QDeclarativeInspectorService::statusChanged(Status status) { + Q_UNUSED(status) updateStatus(); } diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 46e289c8..24e0e2f5 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -209,7 +209,6 @@ public: } void mirrorChange() { - Q_Q(QDeclarativeGridView); regenerate(); } diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index 41bad7df..517554df 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -287,7 +287,6 @@ public: } void mirrorChange() { - Q_Q(QDeclarativeListView); regenerate(); } diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 6c0982f8..3341c280 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -536,7 +536,6 @@ bool QDeclarativeTextEditPrivate::setHAlign(QDeclarativeTextEdit::HAlignment ali { Q_Q(QDeclarativeTextEdit); if (hAlign != alignment || forceAlign) { - QDeclarativeTextEdit::HAlignment oldEffectiveHAlign = q->effectiveHAlign(); hAlign = alignment; emit q->horizontalAlignmentChanged(alignment); return true; diff --git a/src/declarative/qml/qdeclarativecompileddata.cpp b/src/declarative/qml/qdeclarativecompileddata.cpp index 648b6c87..64d66d24 100644 --- a/src/declarative/qml/qdeclarativecompileddata.cpp +++ b/src/declarative/qml/qdeclarativecompileddata.cpp @@ -64,7 +64,7 @@ int QDeclarativeCompiledData::pack(const char *data, size_t size) } int rv = packData.size(); - packData.append(data, size); + packData.append(data, int(size)); return rv; } diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index d99ec7bf..115fb46e 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -2576,7 +2576,7 @@ bool QDeclarativeCompiler::buildDynamicMeta(QDeclarativeParser::Object *obj, Dyn for (int ii = 0; ii < obj->dynamicSlots.count(); ++ii) { Object::DynamicSlot &s = obj->dynamicSlots[ii]; QByteArray sig(s.name + '('); - QString funcScript(QLatin1String("(function ") + s.name + QLatin1Char('(')); + QString funcScript(QStringLiteral("(function ") + QLatin1String(s.name) + QLatin1Char('(')); for (int jj = 0; jj < s.parameterNames.count(); ++jj) { if (jj) { diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp index 1b9ecada..421ebde0 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp +++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp @@ -557,7 +557,8 @@ bool QDeclarativeObjectScriptClass::compare(Object *o1, Object *o2) return d1 == d2 || d1->object == d2->object; } -struct MethodData : public QScriptDeclarativeClass::Object { +class MethodData : public QScriptDeclarativeClass::Object { +public: MethodData(QObject *o, const QDeclarativePropertyCache::Data &d) : object(o), data(d) {} QDeclarativeGuard<QObject> object; |