Re-enable QML component

Change-Id: I84948cf414585af841f3e669ddaf18b7a10fb22f
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

diff --git a/examples/examples.pro b/examples/examples.pro
index 1f7b8ed..76a0e9f 100644 (file)
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -3,7 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS = echoclient \
           echoserver \
           simplechat
-#qtHaveModule(quick): SUBDIRS += qmlwebsocketclient
+qtHaveModule(quick): SUBDIRS += qmlwebsocketclient
 
 contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
 SUBDIRS +=  \

diff --git a/src/src.pro b/src/src.pro
index 2353690..ad1b0c7 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,4 +2,4 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS += websockets
-#qtHaveModule(quick): SUBDIRS += imports
+qtHaveModule(quick): SUBDIRS += imports

diff --git a/src/websockets/doc/qtwebsockets.qdocconf b/src/websockets/doc/qtwebsockets.qdocconf
index c36a5cf..434c9f2 100644 (file)
--- a/src/websockets/doc/qtwebsockets.qdocconf
+++ b/src/websockets/doc/qtwebsockets.qdocconf
@@ -19,17 +19,16 @@ qhp.QtWebSockets.filterAttributes                   = qtwebsockets $QT_VERSION q
 qhp.QtWebSockets.customFilters.Qt.name              = QtWebSockets $QT_VERSION
 qhp.QtWebSockets.customFilters.Qt.filterAttributes  = qtwebsockets $QT_VERSION
 
-#qhp.QtWebSockets.subprojects                        = classes qml examples
-qhp.QtWebSockets.subprojects                        = classes examples
+qhp.QtWebSockets.subprojects                        = classes qml examples
 qhp.QtWebSockets.subprojects.classes.title          = C++ Classes
 qhp.QtWebSockets.subprojects.classes.indexTitle     = Qt WebSockets C++ Classes
 qhp.QtWebSockets.subprojects.classes.selectors      = class fake:headerfile
 qhp.QtWebSockets.subprojects.classes.sortPages      = true
 
-#qhp.QtWebSockets.subprojects.qml.title              = QML Types
-#qhp.QtWebSockets.subprojects.qml.indexTitle         = Qt WebSockets QML Types
-#qhp.QtWebSockets.subprojects.qml.selectors          = fake:qmlclass
-#qhp.QtWebSockets.subprojects.qml.sortPages          = true
+qhp.QtWebSockets.subprojects.qml.title              = QML Types
+qhp.QtWebSockets.subprojects.qml.indexTitle         = Qt WebSockets QML Types
+qhp.QtWebSockets.subprojects.qml.selectors          = fake:qmlclass
+qhp.QtWebSockets.subprojects.qml.sortPages          = true
 
 qhp.QtWebSockets.subprojects.examples.title         = Examples
 qhp.QtWebSockets.subprojects.examples.indexTitle    = Qt WebSockets Examples
@@ -42,11 +41,11 @@ tagfile                                             = ../../../doc/qtwebsockets/
 depends                                             += qtcore qtnetwork qtdoc
 
 headerdirs                                          += ..
-#                                                       ../../imports
+                                                       ../../imports
 
 sourcedirs                                          += .. \
                                                        src
-#                                                       ../../imports
+                                                       ../../imports
 
 
 exampledirs                                         += ../../../examples/ \
@@ -54,4 +53,4 @@ exampledirs                                         += ../../../examples/ \
 
 navigation.landingpage                              = "Qt WebSockets"
 navigation.cppclassespage                           = "Qt WebSockets C++ Classes"
-#navigation.qmltypespage                             = "Qt WebSockets QML Types"
+navigation.qmltypespage                             = "Qt WebSockets QML Types"

diff --git a/src/websockets/doc/src/index.qdoc b/src/websockets/doc/src/index.qdoc
index e942d4a..f85380b 100644 (file)
--- a/src/websockets/doc/src/index.qdoc
+++ b/src/websockets/doc/src/index.qdoc
@@ -54,5 +54,6 @@
     \list
     \li \l{Qt WebSockets C++ Classes}{C++ Classes}
     \li \l{Qt WebSockets Examples}{Examples}
+    \li \l{Qt WebSockets QML Types}{QML Types}
     \endlist
 */

diff --git a/src/websockets/doc/src/qtwebsockets-module.qdoc b/src/websockets/doc/src/qtwebsockets-module.qdoc
index ed54f7f..c4dea41 100644 (file)
--- a/src/websockets/doc/src/qtwebsockets-module.qdoc
+++ b/src/websockets/doc/src/qtwebsockets-module.qdoc
@@ -47,7 +47,6 @@
 */
 
 /*!
-    \internal
     \page qtwebsockets-qml-types.html
     \title Qt WebSockets QML Types
     \brief List of QML types that provide WebSockets communication.