summaryrefslogtreecommitdiffstats
path: root/src/printsupport/configure.json
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-03-28 09:23:03 +0200
committerLiang Qi <liang.qi@qt.io>2017-03-28 09:28:31 +0200
commitb48a13fd6843e12b5725aa3ff0d010007e7c43b4 (patch)
tree316cfe36fc67906efcd92ff806c7c0da56ed4f8e /src/printsupport/configure.json
parent3398d9d40cb0dae2dc2a1a4f7dc3b4b9cceae903 (diff)
parent15fe60cfdada84ea519f08e905d59cc3fb6d20cd (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: examples/examples.pro tests/auto/corelib/tools/qchar/tst_qchar.cpp tests/auto/other/qaccessibility/accessiblewidgets.h Change-Id: I426696c40ab57d14dc295b8103152cede79f244c
Diffstat (limited to 'src/printsupport/configure.json')
-rw-r--r--src/printsupport/configure.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json
index 93d345840f..8d2a633481 100644
--- a/src/printsupport/configure.json
+++ b/src/printsupport/configure.json
@@ -48,7 +48,7 @@
"label": "QPrinter",
"purpose": "Provides a printer backend of QPainter.",
"section": "Painting",
- "condition": "!config.android && !config.uikit && !config.winrt && features.picture && features.temporaryfile && features.pdf",
+ "condition": "!config.uikit && !config.winrt && features.picture && features.temporaryfile && features.pdf",
"output": [ "publicFeature", "feature" ]
},
"printpreviewwidget": {
@@ -66,6 +66,7 @@
"features.buttongroup",
"features.checkbox",
"features.combobox",
+ "features.dialog",
"features.datetimeedit",
"features.dialogbuttonbox",
"features.printer",