whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up freetype conditionals 

there is no point in testing !win32 explicitly any more, as configure
will take this into account already.

Change-Id: Idfca46feece6451509b405a4afc2b7205667c5bb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
bb10
Oswald Buddenhagen 2016-09-28 17:36:44 +02:00
parent 57987ad571
commit 9d8f7bcaa1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platformsupport/fontdatabases/fontdatabases.pri
View File

@ -1,7 +1,7 @@
darwin:!if(watchos:CONFIG(simulator, simulator|device)) {
include($$PWD/mac/coretext.pri)
} else {
!win32|qtConfig(freetype) {
qtConfig(freetype) {
include($$PWD/basic/basic.pri)
}

2
src/plugins/platforms/platforms.pro
View File

@ -5,7 +5,7 @@ android: SUBDIRS += android
!android: SUBDIRS += minimal
!android:if(!win32|qtConfig(freetype)): SUBDIRS += offscreen
!android:qtConfig(freetype): SUBDIRS += offscreen
qtConfig(xcb) {
SUBDIRS += xcb