diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2014-02-02 01:08:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-04 10:27:10 +0100 |
| commit | a759cd77495d34ce5c47d17e3e084084f6cedd04 (patch) | |
| tree | 97d68280a994bfdae8c542687b5704b00f875206 | |
| parent | 97b9d19626a094ca3b0eafa45112861d4a5e1586 (diff) | |
| download | qtwebsockets-a759cd77495d34ce5c47d17e3e084084f6cedd04.tar.gz | |
Comment out QML component
Commented out QWebSocket QML component because there is
still discussion regarding its API.
Change-Id: I9a0699e19186f7e9761517fd127ac8a5263c745f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| -rw-r--r-- | examples/examples.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | src/websockets/doc/qtwebsockets.qdocconf | 24 | ||||
| -rw-r--r-- | src/websockets/doc/src/index.qdoc | 1 | ||||
| -rw-r--r-- | src/websockets/doc/src/qtwebsockets-module.qdoc | 1 |
5 files changed, 14 insertions, 16 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 76a0e9f..1f7b8ed 100644 --- 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 ad1b0c7..2353690 100644 --- 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 ab2ca4e..c36a5cf 100644 --- a/src/websockets/doc/qtwebsockets.qdocconf +++ b/src/websockets/doc/qtwebsockets.qdocconf @@ -19,16 +19,17 @@ 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 qml examples +qhp.QtWebSockets.subprojects = classes 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 @@ -40,12 +41,12 @@ tagfile = ../../../doc/qtwebsockets/ depends += qtcore qtnetwork qtdoc -headerdirs += .. \ - ../../imports +headerdirs += .. +# ../../imports sourcedirs += .. \ - src \ - ../../imports + src +# ../../imports exampledirs += ../../../examples/ \ @@ -53,7 +54,4 @@ exampledirs += ../../../examples/ \ navigation.landingpage = "Qt WebSockets" navigation.cppclassespage = "Qt WebSockets C++ Classes" -navigation.qmltypespage = "Qt WebSockets QML Types" - - -#imagedirs += ./images +#navigation.qmltypespage = "Qt WebSockets QML Types" diff --git a/src/websockets/doc/src/index.qdoc b/src/websockets/doc/src/index.qdoc index c9268b6..e942d4a 100644 --- a/src/websockets/doc/src/index.qdoc +++ b/src/websockets/doc/src/index.qdoc @@ -53,7 +53,6 @@ \section1 Related information \list \li \l{Qt WebSockets C++ Classes}{C++ Classes} - \li \l{Qt WebSockets QML Types}{QML Types} \li \l{Qt WebSockets Examples}{Examples} \endlist */ diff --git a/src/websockets/doc/src/qtwebsockets-module.qdoc b/src/websockets/doc/src/qtwebsockets-module.qdoc index c4dea41..ed54f7f 100644 --- a/src/websockets/doc/src/qtwebsockets-module.qdoc +++ b/src/websockets/doc/src/qtwebsockets-module.qdoc @@ -47,6 +47,7 @@ */ /*! + \internal \page qtwebsockets-qml-types.html \title Qt WebSockets QML Types \brief List of QML types that provide WebSockets communication. |