summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-11-02 12:45:33 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-11-07 07:26:29 +0000
commitc5f18284248cf5ad1d07136764d2e4526b176344 (patch)
tree44de32c3e0a924bfef6cbd4bc03d758b523055a9 /src
parentb18a4de8143cba87502ae5737e28eb6a209c6033 (diff)
Fix freetype detection on QNX
Pass qtConfLibrary_freetype test even when the .../freetype2 folder is not found, so that freetype and fontconfig config.tests are run. This fixes freetype detection on QNX, since the freetype headers are located in the default .../include folder. Task-number: QTBUG-56861 Change-Id: Ic8d72e6509195acd2d22a70603df850361f07b34 Reviewed-by: James McDonnell <jmcdonnell@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/gui/configure.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/configure.pri b/src/gui/configure.pri
index ee5c7730df..aaffa835dc 100644
--- a/src/gui/configure.pri
+++ b/src/gui/configure.pri
@@ -12,7 +12,7 @@ defineTest(qtConfLibrary_freetype) {
return(true)
}
}
- return(false)
+ return(true)
}
# Check for Direct X SDK (include, lib, and direct shader compiler 'fxc').