summaryrefslogtreecommitdiff
path: root/sync.profile
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2014-03-21 16:15:47 +0100
committerPierre Rossi <pierre.rossi@gmail.com>2014-07-04 12:37:29 +0200
commit856dc072acb649be03e02ac64c81015d3f2675c2 (patch)
tree649985d553d6ea92360a66ca291af91c1114596e /sync.profile
parent9f78e0985d2f4fdc2588be57c5f25afdd59c6365 (diff)
downloadqtwebchannel-856dc072acb649be03e02ac64c81015d3f2675c2.tar.gz
Refactor code to use QWebChannelAbstractTransport and QtWebSockets.
This is a quite big changeset, but necessary to get the roadmap implemented that was discussed at QtCS. With this patchset landed, the QWebChannel does not depend on QtWebKit anymore, not even for the tests. Rather, we will introduce the dependency in the other way (i.e. QtWebKit will optionally use QtWebChannel if available). For the pure Qt/C++ use-case, we ship a utility implementation of a QWebChannelAbstractTransport that uses a QWebSocket for the server-client communication. This way, we can get rid of the custom WebSocket implementation. The tests are refactored to run the qwebchannel.js code directly inside QML. Integration tests for QtWebKit/QtWebEngine as well as examples will be added to these repositories. Change-Id: Icc1c1c5918ec46e31d5070937c14c4ca25a3e2d6 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'sync.profile')
-rw-r--r--sync.profile3
1 files changed, 0 insertions, 3 deletions
diff --git a/sync.profile b/sync.profile
index 5d7cd6b..f0e6c33 100644
--- a/sync.profile
+++ b/sync.profile
@@ -15,7 +15,4 @@
"qtwebsockets" => "refs/heads/dev",
# optional dependencies:
"qtdeclarative" => "refs/heads/dev",
- # TODO: disabled for now as it breaks CI builds on OSX
- # requires changes to qtqa scripts as discussed with sifalt, sahumada, tronical
- # "qtwebkit" => "",
);