summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases/mac/coretext.pri
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-04-07 10:18:50 +0200
committerLiang Qi <liang.qi@qt.io>2017-04-07 10:24:33 +0200
commit5d6073be27cb951b692bbcc4dc0dd54cc09c9fd4 (patch)
treec87c236cd1b9c15eb5f40df3d86915687ab6c59a /src/platformsupport/fontdatabases/mac/coretext.pri
parent97d7d80e7355019bb23bb03c2a82908e4436deb0 (diff)
parentbbb67ca32cebad312f02e916dff54e591b92af24 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: mkspecs/linux-icc/qmake.conf mkspecs/macx-icc/qmake.conf mkspecs/win32-icc/qmake.conf src/gui/painting/qgrayraster.c Change-Id: Ib08c45ea3215be05f986ecb3e1f4b37d209aa775
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/coretext.pri')
-rw-r--r--src/platformsupport/fontdatabases/mac/coretext.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri
index 3d928d4e71..434e691d7f 100644
--- a/src/platformsupport/fontdatabases/mac/coretext.pri
+++ b/src/platformsupport/fontdatabases/mac/coretext.pri
@@ -3,8 +3,8 @@ OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.m
qtConfig(freetype) {
QMAKE_USE_PRIVATE += freetype
- HEADERS += basic/qfontengine_ft_p.h
- SOURCES += basic/qfontengine_ft.cpp
+ HEADERS += freetype/qfontengine_ft_p.h
+ SOURCES += freetype/qfontengine_ft.cpp
}
uikit: \