diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 08:26:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 08:49:46 +0200 |
| commit | 630a481854f9dae38b48e1e5e83435746f38c5ae (patch) | |
| tree | 9eda22de10d09391d1e1ff5cf587526596d1b678 /tests | |
| parent | 7722786a1305d9fdd4e0e8856322352c806de25c (diff) | |
| parent | 4189a0d294999246f5a9680d348a1d160d4f591c (diff) | |
Merge "Merge branch 'buildsystem'" into refs/staging/master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qquickaccessible/qquickaccessible.pro | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 3f5ac6924d..818bbdacfc 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -4,8 +4,7 @@ SUBDIRS=\ quick \ headersclean \ particles \ + qmltest \ qmldevtools testcocoon: SUBDIRS -= headersclean - -contains(QT_CONFIG, qmltest): SUBDIRS += qmltest diff --git a/tests/auto/quick/qquickaccessible/qquickaccessible.pro b/tests/auto/quick/qquickaccessible/qquickaccessible.pro index eef914dac5..97b013883f 100644 --- a/tests/auto/quick/qquickaccessible/qquickaccessible.pro +++ b/tests/auto/quick/qquickaccessible/qquickaccessible.pro @@ -18,7 +18,7 @@ OTHER_FILES += data/statictext.qml CONFIG += parallel_test wince*: { - accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll + accessneeded.files = $$QT.widgets.plugins/accessible/*.dll accessneeded.path = accessible DEPLOYMENT += accessneeded } |