From bd1f5e1651c7cdaa712feebe2573dd158c87bb07 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@theqtcompany.com>
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 <alexander.blasche@theqtcompany.com>
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 218d86e..78433a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,4 +56,3 @@ include
 tests/auto/cmake/build
 lib/
 mkspecs/
-qml/
-- 
cgit v1.2.1