diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-25 14:53:09 (GMT) |
commit | 8d720825279c8bf06d28b1f756031402f117002b (patch) | |
tree | 5ea180f93387223c532d76f53d74054ea7a6f2b4 /tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro | |
parent | 8928e37c8b1b375e74c5981915c034123de11b3d (diff) | |
parent | d6197028818e51e78249b029a823fde1b0ffde03 (diff) | |
download | Qt-8d720825279c8bf06d28b1f756031402f117002b.zip Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.gz Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.bz2 |
Merge branch 'master' of git:qt/qt-qml
Conflicts:
src/declarative/graphicsitems/qdeclarativeparticles.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro')
-rw-r--r-- | tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro new file mode 100644 index 0000000..a3afd99 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro @@ -0,0 +1,7 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += network declarative +macx:CONFIG -= app_bundle + +HEADERS += ../shared/debugutil_p.h +SOURCES += tst_qdeclarativedebugclient.cpp \ + ../shared/debugutil.cpp |