summaryrefslogtreecommitdiff
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | Change-Id: I4e8cb48a3626209222ddada7a7560150f6382074
* Bump versionOswald Buddenhagen2017-02-021-1/+1
| | | | Change-Id: I878c1b1ab86938241f45c228b1b1a27a09ffd5ae
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-0/+1
|\ | | | | | | | | | | | | Conflicts: src/websockets/qwebsocket_p.cpp Change-Id: Ib6b9655985246c9ce3968f1eb662be457465a937
| * Eradicate Q_FOREACH and Java-style loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-071-0/+1
| | | | | | | | | | | | Change-Id: I200f72423f13b54c636e995b120a70968b0e0758 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ | | | Change-Id: Ic90945832bc473463a2e8151df619b4fe79147ef
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-241-1/+0
|\ | | | | | | Change-Id: Ic4a2b48535dd9b22a950b84de4bfa2728a859902
| * Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-191-1/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I80cd189fc82481fdc2241db6d2a7d95537c340a6
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: Ibaed49134295c769c9c24f455edadce0434964aa
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-061-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I0378a3e7b0b881909009719e05e390633eec6466 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | Change-Id: I3aba269d326ab71e14ba6291c9c554f010445e24
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I8e3e66926b77dc0a6e27fd9bdcdbdf486c14d802
* | Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ | | | Change-Id: I6e774e49fb3079797be71a0fe8bdf9431bac7886
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: Iba05221292a1be30f250f8f4b093a2d9b405013b
* Bump versionOswald Buddenhagen2014-08-091-1/+1
| | | | Change-Id: I0fdc38bc39f0d3a35253799b926562b49da022f6
* Bump module version to 5.4.0Sergio Ahumada2014-03-131-1/+1
| | | | | Change-Id: I6877931d5ad82310b7ae9d9553bdd8d0f091d340 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Bump module version to 5.3.0Kurt Pattyn2014-01-201-1/+1
| | | | | Change-Id: I93120dafc1457de8b24774a81a4303d71974063e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* No warnings means we can use CONFIG += warning_cleanFrederik Gladhorn2014-01-171-0/+1
| | | | | | | This will use werror to keep the module clean. Change-Id: I6229ff593d1263e30feee474636a35e87d38c4e6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add functionality to ignore ssl errorsKurt Pattyn2013-11-011-1/+1
| | | | | Change-Id: I81248b9af104c0b3d37c9cfcef250a102f4b1d32 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Changes to integrate the websocket module as a full Qt Add-On moduleSteven Ceuppens2013-09-281-0/+5
- Changed project files to use Qt structure - Moved existing sources into subdirectory, to make room for moduels - Created a "import/qmlwebsocket" module skeleton (works, but needs to be extended) - Modified examples to not use "include(.pri)", but use "QT += websocket" - Added qml example skeleton (works, but no useful functionality yet) Project can be build with: $ qmake $ make $ make install Module can be used in other projects with QT += websockets Change-Id: I2123026958b264670dbf8a978dee76edf5855806 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>