summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.3' into 5.4.0v5.4.0-rc1v5.4.05.4.0Oswald Buddenhagen2014-11-105-12/+156
|\ | | | | | | Change-Id: Iae18d5786396e50244c59773b3b0289347e3ef45
| * Fix invalid Date header field in handshake response5.3Joni Poikelin2014-11-034-3/+140
| | | | | | | | | | | | | | | | | | Fix invalid Date header in handshake response on systems with non- english system locale. Task-number: QTBUG-40866 Change-Id: If6d5cc55e879eff259698e87c9cda753990245e7 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Make QWebSocketPrivate::makeConnections() take care of all connections.Christian Kandeler2014-11-031-9/+16
| | | | | | | | | | | | | | | | | | | | Otherwise all code that calls it has to handle the other connections separately, which is error-prone and has actually been forgotten for the case where the QWebSocket is created via upgradeFrom(). Task-number: QTBUG-39551 Change-Id: I4d1e4faa1594b53e7a8dccc9ce13ef2c323b1c61 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Compile fix without proxy supportMaurice Kalinowski2014-11-031-0/+4
| | | | | | | | | | | | | | | | This is required for for the autotests to compile. Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from commit aef4cba4ce5f3acfa6765c71283d9363dffe97b7)
* | Also forward the bytesWritten(qint64) signalPeter Kümmel2014-10-151-0/+1
| | | | | | | | | | | | | | | | The signal bytesWritten(qint64) is part of the public API and should be emitted. Seems it was just forgotten. Change-Id: I85a56c22581c6bd3ecc504add34aeeabc76f4d2a Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Update the plugins.qmltypes meta data.Milian Wolff2014-10-141-0/+50
| | | | | | | | | | | | | | | | I forgot to do this when I introduced the QQmlWebSocketServer. Change-Id: I7fd7354cf42f633973e0da71d854594627e2fb97 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Improve the integration of QtWebsockets into general Qt docsv5.4.0-beta1Alex Blasche2014-09-288-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | 1.) The websocket qml types page is now hooked into Qt's QML Type by Module page. 2.) Correct incorrectly documented import statement for Qt.WebSockets module in QML. 3.) Add missing \since tags (see QTBUG-36775). Change-Id: I1321db70215fcd16cfbd77dd71a459244241d8a3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib38d0c86aa010b06b9a201115dfbc9f091abeb0e
| * Bump versionFrederik Gladhorn2014-08-291-1/+1
| | | | | | | | Change-Id: I7da486fc6640df27695971c70bbb50a842b9cca2
* | Fix QWebSocketServer for clients preferring lowercase http headers.Jorma Tähtinen2014-09-092-14/+14
| | | | | | | | | | | | | | | | | | QWebSocketServer should not use case-sensitive compare to validate http headers for incoming connections. Change-Id: Ie7b8a9f6ca1a0b547eb7a924f6392395f812b0e3 Task-number: QTBUG-40615 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2475-1303/+1706
| | | | | | | | | | | | | | - Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Fix build with non-OpenSSL SSL-enabled backendsAndrew Knight2014-08-131-1/+1
| | | | | | | | | | | | | | | | | | Qt 5.4 introduced the ability to split out the OpenSSL-specific parts of SSL, so allow users of this configuration to still build the SSL server. Change-Id: I03e446c1c0fa4062afe16e58d1b7a80373da12a6 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | WinRT: Fix compiler crash (msvc2013 arm)Maurice Kalinowski2014-08-131-0/+11
| | | | | | | | | | | | | | | | | | Visual Studio 2013 Update 3 ARM compiler has issues with the code path trying to optimize it. Instead of disabling optimization in general, use a pragma for the function. x86 compilation is fine though. Change-Id: If099f7d1400cb78958d10c2fd35daef3bb75fc91 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | remove some pointless noise from project filesOswald Buddenhagen2014-08-083-11/+1
| | | | | | | | | | Change-Id: I69b07bfdb69ec4f9ad8c7bf0e6fc327b76113de6 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | remove custom module pri fileOswald Buddenhagen2014-08-082-12/+0
| | | | | | | | | | | | | | that's been deprecated since the 5.0 release or so. Change-Id: Icbb9f375261a79b708cce4b6e2a70f71140de1d4 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-144-5/+5
|\ \ | |/ | | | | | | | | | | Conflicts: src/imports/qmlwebsockets/qqmlwebsocket.h Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b
| * Use 0 instead of Q_NULLPTR in public headers.v5.3.25.3.2Sergio Martins2014-07-114-4/+4
| | | | | | | | | | | | | | | | Otherwise Q_NULLPTR appears in documentation, which is inconsistent. Change-Id: I0f4b07b25c6012d502938aa452e68c75d910f954 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Compile fix without proxy supportMaurice Kalinowski2014-07-071-0/+4
| | | | | | | | | | Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I55312f10a949dc75fdfbf644631fc844afc29329 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Add initial support for a declarative WebSocketServer.Milian Wolff2014-07-0213-11/+658
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It comes with basic support for setting up a non-secure server listening on an arbitrary host and port. The name can be set, and whether the server should be listening or accept connections. The error string is also available via a property. When a client connects, a clientConnected(QQmlWebSocket*) signal is emitted. To showcase the usage and functionality, a new qmlwebsocketserver example is added which behaves similar to qmlwebsocketclient. It simply sends messages from a WebSocket to a local WebSocketServer which in turn sends a simple response. Change-Id: Ib6318155ed08cbeea47d820b709764d2e36dcc45 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-262-1/+19
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2
| * Fix a typo in proxy handling.Jędrzej Nowacki2014-06-252-1/+19
| | | | | | | | | | | | Change-Id: I25c9b9be2c780dae32e3f634f58e44be303a4b23 Task-number: QTBUG-39568 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I509b98fb944d007cc1e2727e5b6fa8661767c1a6
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-144-2/+8
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc
| * Bump MODULE_VERSION to 5.3.1v5.3.1stable5.3.1Sergio Ahumada2014-05-261-1/+1
| | | | | | | | | | Change-Id: I1eff9112ed777d873961854b3f81a00d34cb3e1f Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Document WebSocket::sendTextMessage(string message)Richard Moe Gustavsen2014-05-231-0/+5
| | | | | | | | | | Change-Id: I38c08520c37d84570c3c8df9d2416131defc5b40 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-143-2/+3
| |\ | | | | | | | | | Change-Id: I9de811ee1f43381b6ce27acd47a126a70fd10d46
| | * Add missing classname for module in qmldir.v5.3.0Frederik Gladhorn2014-05-093-2/+3
| |/ | | | | | | | | | | | | Task-number: QTBUG-38854 Change-Id: Iad6d49309010fd9ccb7e8fcb2c58962d811f018f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | A recent change (46959875) in qdoc raised QML types from subnodes to top-level nodes. This change modifies the documentation configuration file(s) accordingly. Change-Id: I558f00483b4f2efaa12c94066e309f46ea6e9b42 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Add a QUrl serverUrl method to QWebSocketServer.Milian Wolff2014-06-083-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | It is useful in many places, esp. when constructing clients that should connect to the server we created. Note that the returned host address will be LocalHost instead of Any, to make sure clients can connect to the server even on Windows. This should hopefully resolve the CI issues. Change-Id: I3c400ad4d785ea398cf1a1bd113c0833fda9e3bd Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Remove dependency on unused sql moduleFatih Aşıcı2014-05-271-1/+1
| | | | | | | | | | | | Change-Id: I102bcb81ec53d022480e81a3632b93d42bf33403 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
* | Copy the more efficient HTTP header parser from QtNetworkThiago Macieira2014-05-091-21/+46
| | | | | | | | | | | | | | | | | | | | The one from QtNetwork is more efficient, since it doesn't use regular expressions. This also solves a use of uninitialised variables. error: ‘httpStatusCode’ may be used uninitialized in this function [-Werror=maybe-uninitialized] Change-Id: Id7f203d971564651eb0bd63d3d54d074be947793 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Remove superfluous qWarning statementsKurt Pattyn2014-05-051-5/+0
| | | | | | | | | | Change-Id: I3a6f9881cbd19f409f6d345fde640b9899dad196 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-1119-73/+73
|\ \ | |/ | | | | Change-Id: Iff68a7da2065b64579032f1be8eaf5fb097d58bb
| * Use correct casing for WebSocketv5.3.0-rc1Kurt Pattyn2014-04-101-1/+1
| | | | | | | | | | | | Change-Id: Ifbce704186a76b57a4b557b6fc6bfda004517800 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Fix process handshake for servers preferring lowercase http headers.Jędrzej Nowacki2014-04-091-7/+7
| | | | | | | | | | | | Task-number: QTBUG-37975 Change-Id: I81225a870aa92350e959b741aec34332eb8d171e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Use the proper protocol namesSze Howe Koh2014-04-0918-63/+63
| | | | | | | | | | | | | | | | - "WebSocket" is one word, with uppercase 'W' and 'S'. - "HTTP"/"HTTPS" is fully uppercase Change-Id: Ice3a50c94394433c97f7347291af5cda69b234ce Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Fix compilation on QNXSergio Ahumada2014-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Q_DECL_NOEXCEPT to 'bool seed()' and 'quint32 nextMask()' qdefaultmaskgenerator_p.cpp:93:34: error: declaration of 'virtual bool QDefaultMaskGenerator::seed()' has a different exception specifier qdefaultmaskgenerator_p.h:69:10: error: from previous declaration 'virtual bool QDefaultMaskGenerator::seed() noexcept (true)' qdefaultmaskgenerator_p.cpp:104:41: error: declaration of 'virtual quint32 QDefaultMaskGenerator::nextMask()' has a different exception specifier qdefaultmaskgenerator_p.h:70:13: error: from previous declaration 'virtual quint32 QDefaultMaskGenerator::nextMask() noexcept (true)' Change-Id: Iae49a060fa62a33f629cadc1a0100653a12432f7 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-2447-52/+49
|\ \ | |/ | | | | Change-Id: I7215c289188462383799269aa9b736ae76db4d25
| * Doc: Fix example path in documentation configv5.3.0-beta1Topi Reinio2014-03-211-1/+1
| | | | | | | | | | | | Task-number: QTBUG-37643 Change-Id: Ifce8f4016c70642a7ae344b0bab463eb201460df Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Move examples into 'websockets' folderKai Koehne2014-03-1938-10/+13
| | | | | | | | | | | | | | | | | | In the packaging process the content of all 'examples' folders are copied together into one folder ... so modules are supposed to have their submodule name as a sub-folder of 'examples'. Change-Id: I9981b914e8268c932ca5a3d1c9fa73f8db0b6a5b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Doc: small fix in documentationKurt Pattyn2014-03-191-1/+1
| | | | | | | | | | Change-Id: If7c0e3f33c8c73695492511ff51ab58f4a7863d0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * fix compilation with QT_NO_NETWORKPROXYMaurice Kalinowski2014-03-182-1/+5
| | | | | | | | | | Change-Id: Ice7ad51cbbde0ef2459642309c32dd392463754d Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| * fix typo in macroMaurice Kalinowski2014-03-172-2/+2
| | | | | | | | | | | | Change-Id: Ib302db81e0667d0c89c1da8611639db0811ff9f3 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Doc: Language/writ. guidelines review Qt WebSocketsNico Vertriest2014-03-145-27/+24
| | | | | | | | | | | | | | Task-number: QTBUG-37149 Change-Id: Ic0c28928404fc515de40e6fdff11849cdb2929d6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Add generic thumbnails for the examplesTopi Reinio2014-03-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | As the examples do not have any images in their documentation, no thumbnails are generated. This change adds generic 'Qt Code Sample' thumbnails for the examples, ensuring that they are listed in Qt Creator's example list. Change-Id: I40d3c69e9cebad72997d82eba0758c63c146aea7 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Doc: Move and edit examples pageTopi Reinio2014-03-141-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Changed the example page type to a group to have a standardized table of examples. Also, a filename 'examples.html' is too collision-prone when Qt docs are output to a single directory. Also, moved the examples.qdoc file into /doc subdirectory to avoid it from being copied to QT_INSTALL_EXAMPLES when packaging the examples. Change-Id: I87251e0fde127bdef3024907b6472b50039f0357 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Remove unused variableKurt Pattyn2014-03-181-1/+0
| | | | | | | | | | Change-Id: I534878275ea39a28f684c3edac414d647743da69 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Bump module version to 5.4.0Sergio Ahumada2014-03-131-1/+1
| | | | | | | | | | Change-Id: I6877931d5ad82310b7ae9d9553bdd8d0f091d340 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-1326-33/+216
|\ \ | |/ | | | | Change-Id: I0ee590f834200c488498315e66acf7cd046d43ad
View Lorry Controller Status