diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:33 +0100 |
| commit | 91582c53c5c3b404169ce2a44d75ac8102043513 (patch) | |
| tree | 6c52eec2623e3cf41976907cad496dc2489965e5 /tests/auto/qml/qml.pro | |
| parent | 1af97a5f04d4d7d0dbf9954397e2374a791d717b (diff) | |
| parent | d5e2b4bba1e19a51780aa68d47771065755883b3 (diff) | |
| download | qtwebsockets-91582c53c5c3b404169ce2a44d75ac8102043513.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1
Change-Id: Idcd43fba828b00cef553c3142462a4776aeeda8d
Diffstat (limited to 'tests/auto/qml/qml.pro')
| -rw-r--r-- | tests/auto/qml/qml.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 24941ad..8951c55 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += qmlwebsockets qmlwebsockets_compat +!uikit: SUBDIRS += qmlwebsockets qmlwebsockets_compat |