diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-05-30 11:42:04 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-05-30 11:42:04 +1000 |
| commit | a639e6a95c7f8a59cb19fc8eb5f32cf8f2493863 (patch) | |
| tree | 54cf764b928d636d65725f7c7275c8ba528c7499 | |
| parent | 0063c93d1ca1cc69b890e6263b95f18a7667b6ff (diff) | |
| parent | 985787e85dd9d00cb7a5d1e412383b9883f2fe7f (diff) | |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
| -rw-r--r-- | tests/auto/qmltest/qdeclarativebinding/tst_binding.qml (renamed from tests/auto/qmltest/qdecarativebinding/tst_binding.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/qmltest/qdeclarativebinding/tst_binding2.qml (renamed from tests/auto/qmltest/qdecarativebinding/tst_binding2.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml (renamed from tests/auto/qmltest/qdecarativeborderimage/InvalidSciFile.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci (renamed from tests/auto/qmltest/qdecarativeborderimage/colors-round.sci) | 0 | ||||
| -rw-r--r-- | tests/auto/qmltest/qdeclarativeborderimage/colors.png (renamed from tests/auto/qmltest/qdecarativeborderimage/colors.png) | bin | 1655 -> 1655 bytes | |||
| -rw-r--r-- | tests/auto/qmltest/qdeclarativeborderimage/invalid.sci (renamed from tests/auto/qmltest/qdecarativeborderimage/invalid.sci) | 0 | ||||
| -rw-r--r-- | tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml (renamed from tests/auto/qmltest/qdecarativeborderimage/tst_borderimage.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/qmltest/qmltest.pro | 4 | ||||
| -rw-r--r-- | tools/qmltestrunner/qmltestrunner.pro | 7 |
9 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/qmltest/qdecarativebinding/tst_binding.qml b/tests/auto/qmltest/qdeclarativebinding/tst_binding.qml index 5c883c52d1..5c883c52d1 100644 --- a/tests/auto/qmltest/qdecarativebinding/tst_binding.qml +++ b/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 index 85e1951ba7..85e1951ba7 100644 --- a/tests/auto/qmltest/qdecarativebinding/tst_binding2.qml +++ b/tests/auto/qmltest/qdeclarativebinding/tst_binding2.qml diff --git a/tests/auto/qmltest/qdecarativeborderimage/InvalidSciFile.qml b/tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml index d8a6d89b92..d8a6d89b92 100644 --- a/tests/auto/qmltest/qdecarativeborderimage/InvalidSciFile.qml +++ b/tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml diff --git a/tests/auto/qmltest/qdecarativeborderimage/colors-round.sci b/tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci index 5d2f49f0e1..5d2f49f0e1 100644 --- a/tests/auto/qmltest/qdecarativeborderimage/colors-round.sci +++ b/tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci diff --git a/tests/auto/qmltest/qdecarativeborderimage/colors.png b/tests/auto/qmltest/qdeclarativeborderimage/colors.png Binary files differindex dfb62f3d64..dfb62f3d64 100644 --- a/tests/auto/qmltest/qdecarativeborderimage/colors.png +++ b/tests/auto/qmltest/qdeclarativeborderimage/colors.png diff --git a/tests/auto/qmltest/qdecarativeborderimage/invalid.sci b/tests/auto/qmltest/qdeclarativeborderimage/invalid.sci index 98c72c9bf1..98c72c9bf1 100644 --- a/tests/auto/qmltest/qdecarativeborderimage/invalid.sci +++ b/tests/auto/qmltest/qdeclarativeborderimage/invalid.sci diff --git a/tests/auto/qmltest/qdecarativeborderimage/tst_borderimage.qml b/tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml index 4c2c369fe6..4c2c369fe6 100644 --- a/tests/auto/qmltest/qdecarativeborderimage/tst_borderimage.qml +++ b/tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro index 81d867cc42..1b7dad2ace 100644 --- 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 7ace0f7358..c431aafcb5 100644 --- 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 |
