diff options
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/double-conversion/include/double-conversion/utils.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/freetype_dependency.pri | 8 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 4 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz_dependency.pri | 6 | ||||
| -rw-r--r-- | src/3rdparty/pcre/pcre.pro | 2 |
5 files changed, 10 insertions, 12 deletions
diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h index a89b284eda..20bfd36c84 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h @@ -74,8 +74,6 @@ #else #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS #endif // _WIN32 -#elif defined(WINCE) || defined(_WIN32_WCE) -#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__ghs) // Green Hills toolchain uses a 64bit wide floating point stack #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri index 39280deb2f..7513e40bfd 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -1,7 +1,7 @@ -contains(QT_CONFIG, freetype) { - INCLUDEPATH += $$PWD/freetype/include - LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix() -} else:contains(QT_CONFIG, system-freetype) { +contains(QT_CONFIG, system-freetype) { # pull in the proper freetype2 include directory include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) +} else: contains(QT_CONFIG, freetype) { + INCLUDEPATH += $$PWD/freetype/include + LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix() } diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index 4325fd153b..4fd0823332 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -146,8 +146,8 @@ contains(SHAPERS, coretext) { HEADERS += \ $$PWD/src/hb-coretext.h - ios: \ - # On iOS CoreText and CoreGraphics are stand-alone frameworks + uikit: \ + # On iOS/tvOS CoreText and CoreGraphics are stand-alone frameworks LIBS_PRIVATE += -framework CoreText -framework CoreGraphics else: \ # On Mac OS they are part of the ApplicationServices umbrella framework, diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri index 74433688f6..36abbfbe35 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -1,6 +1,6 @@ -contains(QT_CONFIG, harfbuzz) { +contains(QT_CONFIG, system-harfbuzz) { + LIBS_PRIVATE += -lharfbuzz +} else: contains(QT_CONFIG, harfbuzz) { INCLUDEPATH += $$PWD/harfbuzz-ng/include LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix() -} else:contains(QT_CONFIG, system-harfbuzz) { - LIBS_PRIVATE += -lharfbuzz } diff --git a/src/3rdparty/pcre/pcre.pro b/src/3rdparty/pcre/pcre.pro index 53405e0e46..fad82b80b1 100644 --- a/src/3rdparty/pcre/pcre.pro +++ b/src/3rdparty/pcre/pcre.pro @@ -11,7 +11,7 @@ DEFINES += HAVE_CONFIG_H # platform/compiler specific definitions win32: DEFINES += PCRE_STATIC -ios|qnx|winrt: DEFINES += PCRE_DISABLE_JIT +uikit|qnx|winrt: DEFINES += PCRE_DISABLE_JIT SOURCES += \ $$PWD/pcre16_byte_order.c \ |