summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2020-06-12 16:17:49 +0200
committerKai Koehne <kai.koehne@qt.io>2020-07-09 13:11:30 +0200
commitc806adb2924a6ba7a6c40ec0a664f326d5cb06fb (patch)
tree8641a3c52f6911daa3fa5b8503d1e99500030fa1
parentc9e9fd967b38f975e7c5743b7f5c4316df99121e (diff)
Skip building assistant without sqlite
Both assistant as well as qthelpgenerator requires sqlite. Fixes an issue for static builds introduced with commit c35cd309f480d Fixes: QTBUG-84755 Change-Id: Ibceb04429fd6d56d4505b7319396e72a179ffdd1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit e8da2e1b287b1d06b0124ab443af6f8a698c4fa8)
-rw-r--r--src/src.pro5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro
index 5c256ea3b..8ed567b90 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,10 +6,11 @@ qtHaveModule(widgets) {
} else {
QT_FOR_CONFIG += widgets
qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
+ SUBDIRS = designer \
pixeltool
+ !static|contains(QT_PLUGINS, qtsqlite): SUBDIRS += assistant
+
linguist.depends = designer
}
qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator