diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
| commit | dfc177e3a99dd593db4b1e9445d6243ce75ebf07 (patch) | |
| tree | 4e33c7be90a44642e672fff22ea163b500ff3aef /config.tests/unix/freetype/freetype.pri | |
| parent | 72efb2e6f4af2fd909daaf9104f09fd1425acfb0 (diff) | |
| parent | 1d6eb70dcec105af28d6a5e9b59d56c895c70389 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
qmake/library/qmakeevaluator.cpp
(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
src/corelib/kernel/qcore_mac_objc.mm
src/gui/painting/qcolor.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31
Diffstat (limited to 'config.tests/unix/freetype/freetype.pri')
| -rw-r--r-- | config.tests/unix/freetype/freetype.pri | 15 |
1 files changed, 0 insertions, 15 deletions
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 -} |