diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-05 03:03:41 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-05 03:03:41 +0100 |
commit | a63280c8c77df0f09f48df7d154b66317973e990 (patch) | |
tree | 4aadb0fd21d5cd7bcdd572613d96e0b6d63cc2d4 | |
parent | fe82c963b7a5de26a36942c1c2b8a7c34c3fd4da (diff) | |
parent | d264cde2c754a683a723a2b5aad9b634a07eea21 (diff) | |
download | qttools-a63280c8c77df0f09f48df7d154b66317973e990.tar.gz |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I917230d04b8d88bb8e18982680795f7b75080073
-rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index c954cf98a..5c256ea3b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -37,7 +37,7 @@ qtHaveModule(dbus): SUBDIRS += qdbus win32|winrt:SUBDIRS += windeployqt winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag +qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag qtNomakeTools( \ distancefieldgenerator \ |