From bd1f5e1651c7cdaa712feebe2573dd158c87bb07 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 20 May 2015 14:37:58 +0200 Subject: Fix qmldir for qmlwebsockets_compat It is not supported to have both "import Qt.WebSockets 1.0" and "import QtWebSockets 1.0" in the same project. Task-number: QTBUG-46205 Change-Id: I71b824b091f4491b8ab5e1eae8290a51159b03e2 Reviewed-by: Alex Blasche --- tests/auto/auto.pro | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/auto/auto.pro') diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 634e44b..d83cc1f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,3 +1,7 @@ TEMPLATE = subdirs SUBDIRS += websockets + +qtHaveModule(quick) { + SUBDIRS += qml +} -- cgit v1.2.1