diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:13:42 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:14:33 +0100 |
commit | d815621963cee5571ed93fb89561c4884a685b6b (patch) | |
tree | 4c60b5f69eff56fd324e4203d006e1df677670ce /tests/auto/quick/qquickwindow/qquickwindow.pro | |
parent | 9b25a6f39ee59fe1bb4352a5f2e4ef4a91f1f2c3 (diff) | |
parent | 471645f6dba6a21b85cb6788f0a0a07b6d5a804a (diff) |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
Diffstat (limited to 'tests/auto/quick/qquickwindow/qquickwindow.pro')
-rw-r--r-- | tests/auto/quick/qquickwindow/qquickwindow.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickwindow/qquickwindow.pro b/tests/auto/quick/qquickwindow/qquickwindow.pro index 9ae63a9ef1..b1fc5cd4f2 100644 --- a/tests/auto/quick/qquickwindow/qquickwindow.pro +++ b/tests/auto/quick/qquickwindow/qquickwindow.pro @@ -6,13 +6,13 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private v8-private testlib TESTDATA = data/* OTHER_FILES += \ data/AnimationsWhileHidden.qml \ - data/Headless.qml + data/Headless.qml \ + data/showHideAnimate.qml DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |