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 --- demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri | 2 +- examples/declarative/modelviews/abstractitemmodel/model.cpp | 2 +- .../tutorials/extending/chapter6-plugins/chapter6-plugins.pro | 2 +- examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri | 2 +- 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 ++ .../qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro | 2 +- .../auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro | 2 +- tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro | 2 +- .../declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro | 2 +- tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro | 2 +- .../qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro | 2 +- .../declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp | 4 +++- 20 files changed, 21 insertions(+), 18 deletions(-) diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri index 2feb9e0d..1d1c4bdb 100644 --- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri @@ -4,7 +4,7 @@ # It is recommended not to modify this file, since newer versions of Qt Creator # may offer an updated version of it. -QT += quick1 +QT += quick1 widgets SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/examples/declarative/modelviews/abstractitemmodel/model.cpp b/examples/declarative/modelviews/abstractitemmodel/model.cpp index a303ce56..d79bc9e8 100644 --- a/examples/declarative/modelviews/abstractitemmodel/model.cpp +++ b/examples/declarative/modelviews/abstractitemmodel/model.cpp @@ -73,7 +73,7 @@ void AnimalModel::addAnimal(const Animal &animal) endInsertRows(); } -int AnimalModel::rowCount(const QModelIndex & parent) const { +int AnimalModel::rowCount(const QModelIndex &) const { return m_animals.count(); } diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 2d7d9489..70d4cb47 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += quick1 +QT += quick1 widgets DESTDIR = lib OBJECTS_DIR = tmp diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri index 2feb9e0d..1d1c4bdb 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri @@ -4,7 +4,7 @@ # It is recommended not to modify this file, since newer versions of Qt Creator # may offer an updated version of it. -QT += quick1 +QT += quick1 widgets SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h 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 \ diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro index 811fa4cb..4f4d4975 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro +++ b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimatedimage QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private network +contains(QT_CONFIG,quick1): QT += quick1 quick1-private network widgets HEADERS += ../shared/testhttpserver.h SOURCES += tst_qdeclarativeanimatedimage.cpp ../shared/testhttpserver.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index 46914b82..0f5ddc1f 100644 --- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -3,7 +3,7 @@ TARGET = tst_qdeclarativecomponent QT += testlib contains(QT_CONFIG,quick1): QT += quick1 -QT += script network +QT += script network widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativecomponent.cpp diff --git a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro index f75dc602..7d092524 100644 --- a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro +++ b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeloader QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui network +contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui network widgets macx:CONFIG -= app_bundle INCLUDEPATH += ../shared/ diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 96705b98..7f888b70 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeviewer QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private network +contains(QT_CONFIG,quick1): QT += concurrent quick1 quick1-private network macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepixmapcache.cpp diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 73448609..613188e4 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeqt QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script script-private core-private +contains(QT_CONFIG,quick1): QT += quick1 quick1-private script script-private core-private widgets SOURCES += tst_qdeclarativeqt.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index b230d801..a67c6e5a 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativesmoothedanimation QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui core-private script-private +contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui core-private script-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesmoothedanimation.cpp diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index 684fda63..9bc8a4fd 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -2199,6 +2199,8 @@ void tst_qdeclarativetextinput::openInputPanelOnClick() QCOMPARE(ic.m_hideInputPanelCallCount, 0); } + + void tst_qdeclarativetextinput::openInputPanelOnFocus() { PlatformInputContext ic; @@ -2693,7 +2695,7 @@ void tst_qdeclarativetextinput::cursorRectangleSize() QDeclarativeTextInput *textInput = qobject_cast(canvas->rootObject()); QVERIFY(textInput != 0); - textInput->setFocus(Qt::OtherFocusReason); + textInput->setFocus(true); QRectF cursorRect = textInput->positionToRectangle(textInput->cursorPosition()); QRectF microFocusFromScene = canvas->scene()->inputMethodQuery(Qt::ImMicroFocus).toRectF(); QRectF microFocusFromApp= QApplication::focusWidget()->inputMethodQuery(Qt::ImMicroFocus).toRectF(); -- cgit v1.2.3