diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:38:38 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:38:47 +0100 |
commit | aed7aa451f582a772368b80506c7e26c3e8c18a2 (patch) | |
tree | 06632103e243f5d2ec5044f3d4d5afd0a119634f /tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro | |
parent | d140f99fa3052c8957b9247d9c6f9bf47c6c2a92 (diff) | |
parent | 722725cf24e45e86a2844810b90787a29df8a4a9 (diff) |
Merge branch 'stable' into release
Change-Id: I1f4521205b6bb3811294fd2c32df4b4bce97d147
Diffstat (limited to 'tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro')
-rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro index 566ca6c6..d4a5e771 100644 --- a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro +++ b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro @@ -5,8 +5,9 @@ QT += testlib contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private network core-private macx:CONFIG -= app_bundle +include(../shared/qdeclarativedatatest.pri) + SOURCES += tst_qdeclarativetextedit.cpp ../shared/testhttpserver.cpp HEADERS += ../shared/testhttpserver.h -DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |