diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-28 18:04:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-04 20:20:39 +0000 |
| commit | 57987ad57139be7b29e74d7eb60777b3ebb9e271 (patch) | |
| tree | c93872d73171f8dd94e245cb3778e5a76c6dd461 /config.tests | |
| parent | cd8b7fb86517cda1adbfe8fda7beaafddfe5c9bb (diff) | |
fix freetype/fontconfig configure system
convert the ugly config.tests/[...]/freetype.pri file into a custom
callback in configure.pri, and reinstate pkg-config use for freetype.
subsequently, use QMAKE_USE for the actual library references.
this fixes in particular cross-builds, as the new configure was not
passing the necessary information to the test any more, so the old .pri
file misbehaved.
Task-number: QTBUG-54911
Change-Id: I5fc9c254334a2675f7db4d54df4c77637e8e2487
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/unix/fontconfig/fontconfig.pro | 1 | ||||
| -rw-r--r-- | config.tests/unix/freetype/freetype.pri | 15 | ||||
| -rw-r--r-- | config.tests/unix/freetype/freetype.pro | 1 |
3 files changed, 0 insertions, 17 deletions
diff --git a/config.tests/unix/fontconfig/fontconfig.pro b/config.tests/unix/fontconfig/fontconfig.pro index 82dcfc80a0..d6fd00aa3c 100644 --- a/config.tests/unix/fontconfig/fontconfig.pro +++ b/config.tests/unix/fontconfig/fontconfig.pro @@ -1,3 +1,2 @@ SOURCES = fontconfig.cpp CONFIG -= qt -include(../../unix/freetype/freetype.pri) diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri deleted file mode 100644 index 05299ed2fd..0000000000 --- a/config.tests/unix/freetype/freetype.pri +++ /dev/null @@ -1,15 +0,0 @@ -!cross_compile { - TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH - # LSB doesn't allow using headers from /include or /usr/include - linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH - haiku:TRY_INCLUDEPATHS += /system/develop/headers - for(p, TRY_INCLUDEPATHS) { - p = $$join(p, "", "", "/freetype2") - exists($$p):INCLUDEPATH *= $$p - } -} else { - # If we are cross-compiling, then there is still a remote possibility that - # configure detected font-config & freetype, stored in these variables. - QMAKE_CFLAGS += $$QMAKE_CFLAGS_FONTCONFIG - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_FONTCONFIG -} diff --git a/config.tests/unix/freetype/freetype.pro b/config.tests/unix/freetype/freetype.pro index 1a9f06909a..525b60121b 100644 --- a/config.tests/unix/freetype/freetype.pro +++ b/config.tests/unix/freetype/freetype.pro @@ -1,3 +1,2 @@ SOURCES = freetype.cpp CONFIG -= qt -include(freetype.pri) |