From 8d0664c53177d0c823a66239858a101524595c7e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 6 Feb 2012 10:44:16 +0100 Subject: QtQuick1: Fix compilation on Windows. - Add missing modules, includes. - Fix warnings. Change-Id: I21a6107db6c5978ccfd59c4202cf31e3deba19ca Reviewed-by: Andrew den Exter --- src/declarative/debugger/qdeclarativeinspectorservice.cpp | 1 + src/declarative/graphicsitems/qdeclarativegridview.cpp | 1 - src/declarative/graphicsitems/qdeclarativelistview.cpp | 1 - src/declarative/graphicsitems/qdeclarativetextedit.cpp | 1 - src/declarative/qml/qdeclarativecompileddata.cpp | 2 +- src/declarative/qml/qdeclarativecompiler.cpp | 2 +- src/declarative/qml/qdeclarativeobjectscriptclass.cpp | 3 ++- src/imports/shaders/shaders.pro | 2 +- src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro | 2 ++ 9 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src') 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 object; diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro index cdb59577..a8135092 100644 --- a/src/imports/shaders/shaders.pro +++ b/src/imports/shaders/shaders.pro @@ -2,7 +2,7 @@ TARGET = qmlshadersplugin TARGETPATH = Qt/labs/shaders include(../qimportbase.pri) -QT += quick1 opengl +QT += quick1 widgets opengl SOURCES += \ qmlshadersplugin_plugin.cpp \ diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index b4d7fbf3..e4fad4cd 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -5,6 +5,8 @@ load(qt_plugin) DESTDIR = $$QT.quick1.plugins/qmltooling +INCLUDEPATH *= $$PWD + SOURCES += \ qtquick1plugin.cpp \ abstractviewinspector.cpp \ -- cgit v1.2.3