From fb587a3a996d2e9d2fca34cc053df29f6d23f64e Mon Sep 17 00:00:00 2001
From: Milian Wolff <milian.wolff@kdab.com>
Date: Wed, 11 Dec 2013 15:54:33 +0100
Subject: Restructure sources and assimilate to Qt module structure.

This module can hopefully be done in time for 5.3. This commit changes
the source structure and QMake files to adapt to typical Qt modules.

With this in place, we can now use QT += webchannel in qmake files to
link against the pure Qt/C++ QtWebChannel library.

The QML plugin is separated from it and can be loaded optionally, if
the quick module could be found. Also added is now a qmlplugindump
for tooling integration. Note that the Qt.labs namespace is removed.

The test file structure is also adapted to how its done in the
QtDeclarative module.

Note that this setup apparently does not support to run tests without
running make install first.

Change-Id: I1c15d72e7ab5f525d5a6f651f4e965ef86bc17bd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 tests/qml/qml.pro | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'tests/qml/qml.pro')

diff --git a/tests/qml/qml.pro b/tests/qml/qml.pro
index c969291..a2b6933 100644
--- a/tests/qml/qml.pro
+++ b/tests/qml/qml.pro
@@ -1,10 +1,19 @@
-QT += testlib
-
+QT += testlib declarative
+TEMPLATE = app
 TARGET = qml
 
 CONFIG += warn_on qmltestcase
 
-IMPORTPATH += $$OUT_PWD/../../src $$PWD
+# TODO: running tests without requiring make install
+IMPORTPATH += $$PWD
 
 SOURCES += \
     qml.cpp
+
+OTHER_FILES += \
+    WebChannelTest.qml \
+    tst_webchannel.qml \
+    tst_metaobjectpublisher.qml \
+    tst_bench.qml
+
+TESTDATA = data/*
-- 
cgit v1.2.1