QtQuick1: Fix compilation on Windows.

- Add missing modules, includes.
- Fix warnings.

Change-Id: I21a6107db6c5978ccfd59c4202cf31e3deba19ca
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>

7 files changed, 9 insertions, 7 deletions

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<QDeclarativeTextInput *>(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();