Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

diff --git a/tests/auto/qmltest/qdecarativebinding/tst_binding.qml b/tests/auto/qmltest/qdeclarativebinding/tst_binding.qml
similarity index 100%
rename from tests/auto/qmltest/qdecarativebinding/tst_binding.qml
rename to tests/auto/qmltest/qdeclarativebinding/tst_binding.qml

diff --git a/tests/auto/qmltest/qdecarativebinding/tst_binding2.qml b/tests/auto/qmltest/qdeclarativebinding/tst_binding2.qml
similarity index 100%
rename from tests/auto/qmltest/qdecarativebinding/tst_binding2.qml
rename to tests/auto/qmltest/qdeclarativebinding/tst_binding2.qml

diff --git a/tests/auto/qmltest/qdecarativeborderimage/InvalidSciFile.qml b/tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml
similarity index 100%
rename from tests/auto/qmltest/qdecarativeborderimage/InvalidSciFile.qml
rename to tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml

diff --git a/tests/auto/qmltest/qdecarativeborderimage/colors-round.sci b/tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci
similarity index 100%
rename from tests/auto/qmltest/qdecarativeborderimage/colors-round.sci
rename to tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci

diff --git a/tests/auto/qmltest/qdecarativeborderimage/colors.png b/tests/auto/qmltest/qdeclarativeborderimage/colors.png
similarity index 100%
rename from tests/auto/qmltest/qdecarativeborderimage/colors.png
rename to tests/auto/qmltest/qdeclarativeborderimage/colors.png

diff --git a/tests/auto/qmltest/qdecarativeborderimage/invalid.sci b/tests/auto/qmltest/qdeclarativeborderimage/invalid.sci
similarity index 100%
rename from tests/auto/qmltest/qdecarativeborderimage/invalid.sci
rename to tests/auto/qmltest/qdeclarativeborderimage/invalid.sci

diff --git a/tests/auto/qmltest/qdecarativeborderimage/tst_borderimage.qml b/tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml
similarity index 100%
rename from tests/auto/qmltest/qdecarativeborderimage/tst_borderimage.qml
rename to tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml

diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
index 81d867c..1b7dad2 100644 (file)
--- a/tests/auto/qmltest/qmltest.pro
+++ b/tests/auto/qmltest/qmltest.pro
@@ -5,8 +5,8 @@ SOURCES += tst_qmltest.cpp
 
 OTHER_FILES += \
     selftests/tst_selftests.qml \
-    qdecarativebinding/tst_binding2.qml \
-    qdecarativebinding/tst_binding.qml \
+    qdeclarativebinding/tst_binding2.qml \
+    qdeclarativebinding/tst_binding.qml \
     selftests/tst_compare.qml \
     selftests/tst_compare_quickobjects.qml
 

diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
index 7ace0f7..c431aaf 100644 (file)
--- a/tools/qmltestrunner/qmltestrunner.pro
+++ b/tools/qmltestrunner/qmltestrunner.pro
@@ -3,9 +3,10 @@ TARGET = qmltestrunner
 CONFIG += warn_on
 SOURCES += main.cpp
 
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
-    QT += opengl
-}
+
+QT += declarative qmltest
+
+DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$OUT_PWD\\\"\"
 
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target