diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 17:59:46 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 17:59:46 +0200 |
| commit | 4189a0d294999246f5a9680d348a1d160d4f591c (patch) | |
| tree | f0ca75c7dcee691b5ff98f55991dcdf635d19f4c /tests | |
| parent | bdefc3a2a8f8d91a48f822e2281670d8a6b9efbc (diff) | |
| parent | 489651ef7f0e17e210e8a85f8fa95617d14ca7cf (diff) | |
Merge branch 'buildsystem'
Change-Id: I230e776290761be7c811c3aec4d915367012fc99
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 } |