Commit 89d22b6e authored by Thomas Hartmann's avatar Thomas Hartmann

QmlDesigner: Use QtQuick 2 in tests

Also cleaning up some tests.

Change-Id: I531997bc6eb0b9cb8057b7e408bca1c301c88ad0
Reviewed-by: default avatarTim Jenssen <tim.jenssen@theqtcompany.com>
parent 584e0c6b
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -149,7 +149,7 @@ private slots:
// unit tests Instances
//
void testInstancesAttachToExistingModel();
void testInstancesStates();
void testStatesWasInstances();
void testInstancesIdResolution();
void testInstancesNotInScene();
void testInstancesBindingsInStatesStress();
......
......@@ -23,12 +23,12 @@
**
****************************************************************************/
import Qt 4.7
import QtQuick 2.0
Rectangle {
property string text
width : {toprect.width}
width : toprect.width
height : 20
color : "blue"
Text {
......
......@@ -23,13 +23,13 @@
**
****************************************************************************/
import Qt 4.7
import Qt 4.7 as Qt46
import QtQuick 2.0
import QtQuick 2.0 as Qt2
import "subitems"
import "subitems" as Subdir
Qt46.Rectangle {
id : "toprect"
Qt2.Rectangle {
id : toprect
width : 100
height : 50
SubItem {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment