diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/3rdparty/freetype_dependency.pri | 3 | ||||
-rw-r--r-- | src/gui/configure.json | 6 | ||||
-rw-r--r-- | src/gui/configure.pri | 15 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/fontconfig.pri | 2 |
4 files changed, 20 insertions, 6 deletions
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri index 012e4af6c3..cf86b66efd 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -1,6 +1,5 @@ qtConfig(system-freetype) { - # pull in the proper freetype2 include directory - include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) + QMAKE_USE_PRIVATE += freetype/nolink } else: qtConfig(freetype) { INCLUDEPATH += $$PWD/freetype/include LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix() diff --git a/src/gui/configure.json b/src/gui/configure.json index 376359ba37..d3e32e6796 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -87,10 +87,10 @@ }, "freetype": { "label": "FreeType", - "export": "", "test": "unix/freetype", "sources": [ - "-lfreetype" + { "type": "pkgConfig", "args": "freetype2" }, + { "type": "freetype", "libs": "-lfreetype" } ] }, "fontconfig": { @@ -98,7 +98,7 @@ "test": "unix/fontconfig", "sources": [ { "type": "pkgConfig", "args": "fontconfig freetype2" }, - "-lfontconfig -lfreetype" + { "type": "freetype", "libs": "-lfontconfig -lfreetype" } ] }, "gbm": { diff --git a/src/gui/configure.pri b/src/gui/configure.pri index d79c5a6bba..10e50d3654 100644 --- a/src/gui/configure.pri +++ b/src/gui/configure.pri @@ -1,5 +1,20 @@ # custom tests +defineTest(qtConfLibrary_freetype) { + TRY_INCLUDEPATHS = $$EXTRA_INCLUDEPATH $$QMAKE_INCDIR_X11 + haiku: TRY_INCLUDEPATHS += /system/develop/headers + TRY_INCLUDEPATHS += $$QMAKE_DEFAULT_INCDIR + for (p, TRY_INCLUDEPATHS) { + includedir = $$p/freetype2 + exists($$includedir) { + $${1}.includedir = "$$val_escape(includedir)" + export($${1}.includedir) + return(true) + } + } + return(false) +} + # Check for Direct X SDK (include, lib, and direct shader compiler 'fxc'). # Up to Direct X SDK June 2010 and for MinGW, this is pointed to by the # DXSDK_DIR variable. Starting with Windows Kit 8, it is included in diff --git a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri index 63097c33c1..911f0c884d 100644 --- a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri +++ b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri @@ -3,4 +3,4 @@ HEADERS += $$PWD/qfontconfigdatabase_p.h \ SOURCES += $$PWD/qfontconfigdatabase.cpp \ $$PWD/qfontenginemultifontconfig.cpp -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_FONTCONFIG +QMAKE_USE += fontconfig/nolink |