summaryrefslogtreecommitdiff
path: root/src/qtdiag
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-04-15 14:06:46 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-04-15 15:08:54 +0200
commite6ad150805cc64db20d3ff3ae5fe2d356c04913b (patch)
tree0b3b6ea949c5a42005d564b79b1783b935f1a85e /src/qtdiag
parent830f1db786de48d34b16905086220a6ac28a0203 (diff)
parent1b992406a6523a144c58baa9bbd1198bb9a2d98c (diff)
downloadqttools-e6ad150805cc64db20d3ff3ae5fe2d356c04913b.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts: a bunch of .pro and configure.json file adjustments and some conflicting cherry-picks from dev -> 5.15 that are merged into dev again src/assistant/assistant/main.cpp Change-Id: I174c00b6a300c6d46c4e081bdcb2f15f23ae9ef2
Diffstat (limited to 'src/qtdiag')
-rw-r--r--src/qtdiag/qtdiag.pro4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qtdiag/qtdiag.pro b/src/qtdiag/qtdiag.pro
index b9b3c6e56..410339804 100644
--- a/src/qtdiag/qtdiag.pro
+++ b/src/qtdiag/qtdiag.pro
@@ -1,3 +1,7 @@
+include($$OUT_PWD/../../src/global/qttools-config.pri)
+QT_FOR_CONFIG += tools-private
+requires(qtConfig(qtdiag))
+
CONFIG += console
QT += core-private gui-private