diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-09 15:45:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-10 12:47:04 +0000 |
| commit | 318e6d758065892fbb0b56c86b8ed1f2b23cf931 (patch) | |
| tree | 087535606cc55e2dd37e2ba7d670d2314be31dae /src/core/configure.json | |
| parent | 5a5cc11a72826b8864fc758025aaea4fd106fe41 (diff) | |
| parent | efee223d7ff6e0e30fb9d9dff1536936922d4a03 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/core/profile_adapter.cpp
src/core/profile_adapter.h
src/webengine/api/qquickwebengineprofile.cpp
src/webenginewidgets/api/qwebengineprofile.cpp
tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
Change-Id: Ic561f22b361e32a0a63668c73bf6c0fc9c1ce16f
Diffstat (limited to 'src/core/configure.json')
| -rw-r--r-- | src/core/configure.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index 6bc6a213c..bb8ad7997 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -5,6 +5,7 @@ "gui-private", "printsupport" ], + "condition": "module.gui", "testDir": "../../config.tests", "commandline": { "options": { |