diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-22 10:15:48 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-07-22 10:15:48 +0000 |
| commit | 601019e3f42516b5799fe519115f8fbdf44ed18a (patch) | |
| tree | d9c800ede4d8a38a73dcb0f3aea54e5954e64d54 /src/plugins/platforms/minimal/minimal.pro | |
| parent | b5f18da11fb526a444d2550715d8b867b711e67a (diff) | |
| parent | 782ebeada125e3d8a293c7806e34cc737c30ddda (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/minimal/minimal.pro')
| -rw-r--r-- | src/plugins/platforms/minimal/minimal.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index bd6f2d8e6f..3aca27b555 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -11,7 +11,7 @@ HEADERS = qminimalintegration.h \ OTHER_FILES += minimal.json CONFIG += qpa/genericunixfontdatabase -darwin: DEFINES += QT_NO_FONTCONFIG +win32|darwin: DEFINES += QT_NO_FONTCONFIG PLUGIN_TYPE = platforms PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin |