diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-21 19:07:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-21 19:07:53 +0100 |
| commit | 65faf4565595d91996ddec4af25af5e97c7f0317 (patch) | |
| tree | a7415e90db3fa1e46f638e1c31d2f2b9a5d0ec4a /src/printsupport/configure.json | |
| parent | a9383ef99a29c333a1edd32695ddc29ea0ba805d (diff) | |
| parent | 26bc4ac5cb56ce8f2d3d10125fa9c6a72140573a (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/platforms/eglfs/eglfs-plugin.pro
Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db
Diffstat (limited to 'src/printsupport/configure.json')
| -rw-r--r-- | src/printsupport/configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json index 93d345840f..cd775644c9 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": { |