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

Introduce src/3rdparty/freetype.pri for better maintenance 

This deduplicates qmake rules in platformsupport and platform plugins.

Change-Id: Ie9c7d933c4433b96bf502e9753a12faa238b4569
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
bb10
Konstantin Ritt 2015-03-09 14:12:25 +04:00
parent 2f4a99d1a1
commit 6c372d46f8
3 changed files with 70 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/3rdparty/freetype.pri vendored Normal file
View File

@ -0,0 +1,67 @@
QT_FREETYPE_DIR = $$PWD/freetype
SOURCES += \
$$QT_FREETYPE_DIR/src/autofit/afangles.c \
$$QT_FREETYPE_DIR/src/autofit/afdummy.c \
$$QT_FREETYPE_DIR/src/autofit/afglobal.c \
$$QT_FREETYPE_DIR/src/autofit/afhints.c \
$$QT_FREETYPE_DIR/src/autofit/aflatin.c \
$$QT_FREETYPE_DIR/src/autofit/afloader.c \
$$QT_FREETYPE_DIR/src/autofit/afmodule.c \
$$QT_FREETYPE_DIR/src/autofit/autofit.c \
$$QT_FREETYPE_DIR/src/base/ftbase.c \
$$QT_FREETYPE_DIR/src/base/ftbitmap.c \
$$QT_FREETYPE_DIR/src/base/ftbbox.c \
$$QT_FREETYPE_DIR/src/base/ftdebug.c \
$$QT_FREETYPE_DIR/src/base/ftglyph.c \
$$QT_FREETYPE_DIR/src/base/ftinit.c \
$$QT_FREETYPE_DIR/src/base/ftlcdfil.c \
$$QT_FREETYPE_DIR/src/base/ftmm.c \
$$QT_FREETYPE_DIR/src/base/ftsynth.c \
$$QT_FREETYPE_DIR/src/base/fttype1.c \
$$QT_FREETYPE_DIR/src/bdf/bdf.c \
$$QT_FREETYPE_DIR/src/cache/ftcache.c \
$$QT_FREETYPE_DIR/src/cff/cff.c \
$$QT_FREETYPE_DIR/src/cid/type1cid.c \
$$QT_FREETYPE_DIR/src/gzip/ftgzip.c \
$$QT_FREETYPE_DIR/src/lzw/ftlzw.c \
$$QT_FREETYPE_DIR/src/otvalid/otvalid.c \
$$QT_FREETYPE_DIR/src/otvalid/otvbase.c \
$$QT_FREETYPE_DIR/src/otvalid/otvcommn.c \
$$QT_FREETYPE_DIR/src/otvalid/otvgdef.c \
$$QT_FREETYPE_DIR/src/otvalid/otvgpos.c \
$$QT_FREETYPE_DIR/src/otvalid/otvgsub.c \
$$QT_FREETYPE_DIR/src/otvalid/otvjstf.c \
$$QT_FREETYPE_DIR/src/otvalid/otvmod.c \
$$QT_FREETYPE_DIR/src/pcf/pcf.c \
$$QT_FREETYPE_DIR/src/pfr/pfr.c \
$$QT_FREETYPE_DIR/src/psaux/psaux.c \
$$QT_FREETYPE_DIR/src/pshinter/pshinter.c \
$$QT_FREETYPE_DIR/src/psnames/psmodule.c \
$$QT_FREETYPE_DIR/src/raster/raster.c \
$$QT_FREETYPE_DIR/src/sfnt/sfnt.c \
$$QT_FREETYPE_DIR/src/smooth/smooth.c \
$$QT_FREETYPE_DIR/src/truetype/truetype.c \
$$QT_FREETYPE_DIR/src/type1/type1.c \
$$QT_FREETYPE_DIR/src/type42/type42.c \
$$QT_FREETYPE_DIR/src/winfonts/winfnt.c
win32 {
SOURCES += $$QT_FREETYPE_DIR/src/base/ftsystem.c
} else {
SOURCES += $$QT_FREETYPE_DIR/builds/unix/ftsystem.c
INCLUDEPATH += $$QT_FREETYPE_DIR/builds/unix
}
INCLUDEPATH += $$QT_FREETYPE_DIR/src $$QT_FREETYPE_DIR/include
DEFINES += FT2_BUILD_LIBRARY
contains(QT_CONFIG, system-zlib) {
DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
include($$PWD/zlib_dependency.pri)
}
# disable warnings about "unsafe" methods in C code
msvc:QMAKE_CFLAGS_WARN_ON += -wd"4996"
TR_EXCLUDE += $$QT_FREETYPE_DIR/*

73
src/platformsupport/fontdatabases/basic/basic.pri
View File

@ -11,78 +11,7 @@ SOURCES += \
CONFIG += opentype
contains(QT_CONFIG, freetype) {
QT_FREETYPE_DIR = $$QT_SOURCE_TREE/src/3rdparty/freetype
SOURCES += \
$$QT_FREETYPE_DIR/src/base/ftbase.c \
$$QT_FREETYPE_DIR/src/base/ftbbox.c \
$$QT_FREETYPE_DIR/src/base/ftdebug.c \
$$QT_FREETYPE_DIR/src/base/ftglyph.c \
$$QT_FREETYPE_DIR/src/base/ftlcdfil.c \
$$QT_FREETYPE_DIR/src/base/ftinit.c \
$$QT_FREETYPE_DIR/src/base/ftmm.c \
$$QT_FREETYPE_DIR/src/base/fttype1.c \
$$QT_FREETYPE_DIR/src/base/ftsynth.c \
$$QT_FREETYPE_DIR/src/base/ftbitmap.c \
$$QT_FREETYPE_DIR/src/bdf/bdf.c \
$$QT_FREETYPE_DIR/src/cache/ftcache.c \
$$QT_FREETYPE_DIR/src/cff/cff.c \
$$QT_FREETYPE_DIR/src/cid/type1cid.c \
$$QT_FREETYPE_DIR/src/gzip/ftgzip.c \
$$QT_FREETYPE_DIR/src/pcf/pcf.c \
$$QT_FREETYPE_DIR/src/pfr/pfr.c \
$$QT_FREETYPE_DIR/src/psaux/psaux.c \
$$QT_FREETYPE_DIR/src/pshinter/pshinter.c \
$$QT_FREETYPE_DIR/src/psnames/psmodule.c \
$$QT_FREETYPE_DIR/src/raster/raster.c \
$$QT_FREETYPE_DIR/src/sfnt/sfnt.c \
$$QT_FREETYPE_DIR/src/smooth/smooth.c \
$$QT_FREETYPE_DIR/src/truetype/truetype.c \
$$QT_FREETYPE_DIR/src/type1/type1.c \
$$QT_FREETYPE_DIR/src/type42/type42.c \
$$QT_FREETYPE_DIR/src/winfonts/winfnt.c \
$$QT_FREETYPE_DIR/src/lzw/ftlzw.c\
$$QT_FREETYPE_DIR/src/otvalid/otvalid.c\
$$QT_FREETYPE_DIR/src/otvalid/otvbase.c\
$$QT_FREETYPE_DIR/src/otvalid/otvgdef.c\
$$QT_FREETYPE_DIR/src/otvalid/otvjstf.c\
$$QT_FREETYPE_DIR/src/otvalid/otvcommn.c\
$$QT_FREETYPE_DIR/src/otvalid/otvgpos.c\
$$QT_FREETYPE_DIR/src/otvalid/otvgsub.c\
$$QT_FREETYPE_DIR/src/otvalid/otvmod.c\
$$QT_FREETYPE_DIR/src/autofit/afangles.c\
$$QT_FREETYPE_DIR/src/autofit/afglobal.c\
$$QT_FREETYPE_DIR/src/autofit/aflatin.c\
$$QT_FREETYPE_DIR/src/autofit/afmodule.c\
$$QT_FREETYPE_DIR/src/autofit/afdummy.c\
$$QT_FREETYPE_DIR/src/autofit/afhints.c\
$$QT_FREETYPE_DIR/src/autofit/afloader.c\
$$QT_FREETYPE_DIR/src/autofit/autofit.c
win32 {
SOURCES += \
$$QT_FREETYPE_DIR/src/base/ftsystem.c
} else {
SOURCES += \
$$QT_FREETYPE_DIR/builds/unix/ftsystem.c
INCLUDEPATH += \
$$QT_FREETYPE_DIR/builds/unix
}
# disable warnings about "unsafe" methods in C code
msvc:QMAKE_CFLAGS_WARN_ON += -wd"4996"
INCLUDEPATH += \
$$QT_FREETYPE_DIR/src \
$$QT_FREETYPE_DIR/include
TR_EXCLUDE += $$QT_FREETYPE_DIR/*
DEFINES += FT2_BUILD_LIBRARY
contains(QT_CONFIG, system-zlib) {
DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
include($$PWD/../../../3rdparty/zlib_dependency.pri)
}
include($$QT_SOURCE_TREE/src/3rdparty/freetype.pri)
} else:contains(QT_CONFIG, system-freetype) {
# pull in the proper freetype2 include directory
include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)

62
src/plugins/platforms/windows/windows.pri
View File

@ -122,69 +122,11 @@ contains(QT_CONFIG,dynamicgl) {
contains(QT_CONFIG, freetype) {
DEFINES *= QT_NO_FONTCONFIG
QT_FREETYPE_DIR = $$QT_SOURCE_TREE/src/3rdparty/freetype
include($$QT_SOURCE_TREE/src/3rdparty/freetype.pri)
HEADERS += \
$$PWD/qwindowsfontdatabase_ft.h
SOURCES += \
$$PWD/qwindowsfontdatabase_ft.cpp \
$$QT_FREETYPE_DIR/src/base/ftbase.c \
$$QT_FREETYPE_DIR/src/base/ftbbox.c \
$$QT_FREETYPE_DIR/src/base/ftdebug.c \
$$QT_FREETYPE_DIR/src/base/ftglyph.c \
$$QT_FREETYPE_DIR/src/base/ftinit.c \
$$QT_FREETYPE_DIR/src/base/ftmm.c \
$$QT_FREETYPE_DIR/src/base/fttype1.c \
$$QT_FREETYPE_DIR/src/base/ftsynth.c \
$$QT_FREETYPE_DIR/src/base/ftbitmap.c \
$$QT_FREETYPE_DIR/src/bdf/bdf.c \
$$QT_FREETYPE_DIR/src/cache/ftcache.c \
$$QT_FREETYPE_DIR/src/cff/cff.c \
$$QT_FREETYPE_DIR/src/cid/type1cid.c \
$$QT_FREETYPE_DIR/src/gzip/ftgzip.c \
$$QT_FREETYPE_DIR/src/pcf/pcf.c \
$$QT_FREETYPE_DIR/src/pfr/pfr.c \
$$QT_FREETYPE_DIR/src/psaux/psaux.c \
$$QT_FREETYPE_DIR/src/pshinter/pshinter.c \
$$QT_FREETYPE_DIR/src/psnames/psmodule.c \
$$QT_FREETYPE_DIR/src/raster/raster.c \
$$QT_FREETYPE_DIR/src/sfnt/sfnt.c \
$$QT_FREETYPE_DIR/src/smooth/smooth.c \
$$QT_FREETYPE_DIR/src/truetype/truetype.c \
$$QT_FREETYPE_DIR/src/type1/type1.c \
$$QT_FREETYPE_DIR/src/type42/type42.c \
$$QT_FREETYPE_DIR/src/winfonts/winfnt.c \
$$QT_FREETYPE_DIR/src/lzw/ftlzw.c\
$$QT_FREETYPE_DIR/src/otvalid/otvalid.c\
$$QT_FREETYPE_DIR/src/otvalid/otvbase.c\
$$QT_FREETYPE_DIR/src/otvalid/otvgdef.c\
$$QT_FREETYPE_DIR/src/otvalid/otvjstf.c\
$$QT_FREETYPE_DIR/src/otvalid/otvcommn.c\
$$QT_FREETYPE_DIR/src/otvalid/otvgpos.c\
$$QT_FREETYPE_DIR/src/otvalid/otvgsub.c\
$$QT_FREETYPE_DIR/src/otvalid/otvmod.c\
$$QT_FREETYPE_DIR/src/autofit/afangles.c\
$$QT_FREETYPE_DIR/src/autofit/afglobal.c\
$$QT_FREETYPE_DIR/src/autofit/aflatin.c\
$$QT_FREETYPE_DIR/src/autofit/afmodule.c\
$$QT_FREETYPE_DIR/src/autofit/afdummy.c\
$$QT_FREETYPE_DIR/src/autofit/afhints.c\
$$QT_FREETYPE_DIR/src/autofit/afloader.c\
$$QT_FREETYPE_DIR/src/autofit/autofit.c
SOURCES += $$QT_FREETYPE_DIR/src/base/ftsystem.c
INCLUDEPATH += \
$$QT_FREETYPE_DIR/src \
$$QT_FREETYPE_DIR/include
TR_EXCLUDE += $$QT_FREETYPE_DIR/*
DEFINES += FT2_BUILD_LIBRARY
contains(QT_CONFIG, system-zlib) {
DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
}
$$PWD/qwindowsfontdatabase_ft.cpp
} else:contains(QT_CONFIG, system-freetype) {
include($$QT_SOURCE_TREE/src/platformsupport/fontdatabases/basic/basic.pri)
HEADERS += \