diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-23 16:00:29 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-23 16:00:29 +0100 |
| commit | 6b19edaefe7edcdc12a1faa269d77e42a14fc81d (patch) | |
| tree | 2c5a803fc8f7b0e8b2c83f49dcd846c2dba72e16 /src/imports/qmlwebsockets | |
| parent | 5fc2b148cfa763007810d7b6256ea50d82bf7e45 (diff) | |
| parent | 8fc139318b2f870aa633e93874b3fa6e9d1113ae (diff) | |
| download | qtwebsockets-6b19edaefe7edcdc12a1faa269d77e42a14fc81d.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: I1608720522e974c7107f00599a9fb70f17865189
Diffstat (limited to 'src/imports/qmlwebsockets')
| -rw-r--r-- | src/imports/qmlwebsockets/plugins.qmltypes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes index 79e2f97..cabe5a2 100644 --- a/src/imports/qmlwebsockets/plugins.qmltypes +++ b/src/imports/qmlwebsockets/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.13' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.15' Module { dependencies: [] |