summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qmlengine/qmlengine.pro
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-25 14:53:09 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-25 14:53:09 (GMT)
commit8d720825279c8bf06d28b1f756031402f117002b (patch)
tree5ea180f93387223c532d76f53d74054ea7a6f2b4 /tests/auto/declarative/qmlengine/qmlengine.pro
parent8928e37c8b1b375e74c5981915c034123de11b3d (diff)
parentd6197028818e51e78249b029a823fde1b0ffde03 (diff)
downloadQt-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/qmlengine/qmlengine.pro')
-rw-r--r--tests/auto/declarative/qmlengine/qmlengine.pro8
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/declarative/qmlengine/qmlengine.pro b/tests/auto/declarative/qmlengine/qmlengine.pro
deleted file mode 100644
index 1a0e5f4..0000000
--- a/tests/auto/declarative/qmlengine/qmlengine.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative network
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlengine.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"