diff options
| -rw-r--r-- | src/platformsupport/fontdatabases/basicunix/basicunix.pri | 4 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/fontdatabases.pri | 3 | ||||
| -rw-r--r-- | src/platformsupport/platformsupport.pro | 1 | ||||
| -rw-r--r-- | src/widgets/widgets.pro | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/platformsupport/fontdatabases/basicunix/basicunix.pri b/src/platformsupport/fontdatabases/basicunix/basicunix.pri index bd57b384b3..f83b89063b 100644 --- a/src/platformsupport/fontdatabases/basicunix/basicunix.pri +++ b/src/platformsupport/fontdatabases/basicunix/basicunix.pri @@ -9,10 +9,6 @@ SOURCES += \ $$PWD/qbasicunixfontdatabase.cpp \ $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - -INCLUDEPATH += $$PWD - CONFIG += opentype contains(QT_CONFIG, freetype) { diff --git a/src/platformsupport/fontdatabases/fontdatabases.pri b/src/platformsupport/fontdatabases/fontdatabases.pri index 609a548ad1..0e282d97dd 100644 --- a/src/platformsupport/fontdatabases/fontdatabases.pri +++ b/src/platformsupport/fontdatabases/fontdatabases.pri @@ -1,3 +1,6 @@ +DEFINES += QT_COMPILES_IN_HARFBUZZ +INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src + unix { include($$PWD/basicunix/basicunix.pri) include($$PWD/genericunix/genericunix.pri) diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 20052e86aa..5e1cc6a909 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,3 +1,4 @@ +load(qt_module) TARGET = QtPlatformSupport QPRO_PWD = $$PWD QT += core-private gui-private diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index bf8eca6fc9..0af43d6dd1 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -1,3 +1,5 @@ +load(qt_module) + TARGET = QtWidgets QPRO_PWD = $$PWD QT = core core-private gui gui-private |