summaryrefslogtreecommitdiff
path: root/tests/auto/auto.pro
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2014-07-02 16:03:37 +0200
committerMilian Wolff <milian.wolff@kdab.com>2014-07-03 13:44:42 +0200
commit5418f5795e2fd657efa3ceede749228c1e10d25c (patch)
tree0d3109f25ab416befbaa44ba26f1380d64b30db6 /tests/auto/auto.pro
parent3c1884f15ed1120bf36efb918cad0bcb461d5193 (diff)
downloadqtwebchannel-5418f5795e2fd657efa3ceede749228c1e10d25c.tar.gz
Add cmake test, adapt test directory layout and point to dev branches.
The auto tests are now located in tests/auto instead of directly in tests/. This is required to ensure the cmake test is found. Furthermore, the sync.profile is updated to point to refs/heads/dev, as we target Qt 5.4 with this new module. Change-Id: I1e6e99968b7081b5774eaf30319cac1fbaed35c2 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r--tests/auto/auto.pro7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
new file mode 100644
index 0000000..4c998e9
--- /dev/null
+++ b/tests/auto/auto.pro
@@ -0,0 +1,7 @@
+TEMPLATE = subdirs
+
+SUBDIRS += cmake webchannel
+
+qtHaveModule(webkit):qtHaveModule(quick) {
+ SUBDIRS += qml
+}