diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:08:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:08:40 +0100 |
| commit | aa8e59c09cb03f56047ca65c3e89dd6daeec4d73 (patch) | |
| tree | d45d5513511b0767925f453b637bda08139562da /tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro | |
| parent | ae764c678c78c1e3530a6d0dc2de2a17c5d4815a (diff) | |
| parent | cf8ef1676b70d70f5e1d2725d0b24d7df5e8cfe4 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
Diffstat (limited to 'tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro')
| -rw-r--r-- | tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index 85679451..df8d2995 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -2,8 +2,7 @@ CONFIG += testcase testcase.timeout = 1200 # this is a slow test TARGET = tst_qdeclarativexmlhttprequest -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative network +QT += testlib declarative network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h |