diff options
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 16 | ||||
-rw-r--r-- | src/3rdparty/iaccessible2/generated/x86/ia2_api_all.h | 4 | ||||
-rw-r--r-- | src/3rdparty/iaccessible2/generated/x86/ia2_api_all_i.c | 6 | ||||
-rw-r--r-- | src/3rdparty/icc/LICENSE.txt | 10 | ||||
-rw-r--r-- | src/3rdparty/icc/qt_attribution.json | 15 | ||||
-rw-r--r-- | src/3rdparty/icc/sRGB2014.icc | bin | 0 -> 3024 bytes | |||
-rw-r--r-- | src/3rdparty/sqlite.pri | 2 |
7 files changed, 34 insertions, 19 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index 3b7b11c8ee..e5746bf3eb 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -168,21 +168,7 @@ contains(SHAPERS, coretext) { # even in 10.8 where they were also made available stand-alone. LIBS_PRIVATE += -framework ApplicationServices - # CoreText is documented to be available on watchOS, but the headers aren't present - # in the watchOS Simulator SDK like they are supposed to be. Work around the problem - # by adding the device SDK's headers to the search path as a fallback. - # rdar://25314492, rdar://27844864 - watchos:simulator { - simulator_system_frameworks = $$xcodeSDKInfo(Path, $${simulator.sdk})/System/Library/Frameworks - device_system_frameworks = $$xcodeSDKInfo(Path, $${device.sdk})/System/Library/Frameworks - for (arch, QMAKE_APPLE_SIMULATOR_ARCHS) { - QMAKE_CXXFLAGS += \ - -Xarch_$${arch} \ - -F$$simulator_system_frameworks \ - -Xarch_$${arch} \ - -F$$device_system_frameworks - } - } + CONFIG += watchos_coretext } contains(SHAPERS, fallback)|isEmpty(SHAPERS) { diff --git a/src/3rdparty/iaccessible2/generated/x86/ia2_api_all.h b/src/3rdparty/iaccessible2/generated/x86/ia2_api_all.h index eb3b57b8bd..9e4be75bb9 100644 --- a/src/3rdparty/iaccessible2/generated/x86/ia2_api_all.h +++ b/src/3rdparty/iaccessible2/generated/x86/ia2_api_all.h @@ -16,7 +16,9 @@ */ /* @@MIDL_FILE_HEADING( ) */ -#pragma warning( disable: 4049 ) /* more than 64k source lines */ +#ifdef _MSC_VER +# pragma warning( disable: 4049 ) /* more than 64k source lines */ +#endif /* verify that the <rpcndr.h> version is high enough to compile this file*/ diff --git a/src/3rdparty/iaccessible2/generated/x86/ia2_api_all_i.c b/src/3rdparty/iaccessible2/generated/x86/ia2_api_all_i.c index c50b3e9a4f..61bb5ee5f7 100644 --- a/src/3rdparty/iaccessible2/generated/x86/ia2_api_all_i.c +++ b/src/3rdparty/iaccessible2/generated/x86/ia2_api_all_i.c @@ -18,7 +18,9 @@ */ /* @@MIDL_FILE_HEADING( ) */ -#pragma warning( disable: 4049 ) /* more than 64k source lines */ +#ifdef _MSC_VER +# pragma warning( disable: 4049 ) /* more than 64k source lines */ +#endif #ifdef __cplusplus @@ -65,7 +67,7 @@ typedef IID CLSID; #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif !_MIDL_USE_GUIDDEF_ +#endif // !_MIDL_USE_GUIDDEF_ MIDL_DEFINE_GUID(IID, IID_IAccessibleRelation,0x7CDF86EE,0xC3DA,0x496a,0xBD,0xA4,0x28,0x1B,0x33,0x6E,0x1F,0xDC); diff --git a/src/3rdparty/icc/LICENSE.txt b/src/3rdparty/icc/LICENSE.txt new file mode 100644 index 0000000000..e25b1d39f1 --- /dev/null +++ b/src/3rdparty/icc/LICENSE.txt @@ -0,0 +1,10 @@ +For the file sRGB2014.icc: + +Copyright International Color Consortium, 2015 + +This profile is made available by the International Color Consortium, and may be copied, +distributed, embedded, made, used, and sold without restriction. Altered versions of this +profile shall have the original identification and copyright information removed and +shall not be misrepresented as the original profile. + +(original source location: http://www.color.org/srgbprofiles.xalter) diff --git a/src/3rdparty/icc/qt_attribution.json b/src/3rdparty/icc/qt_attribution.json new file mode 100644 index 0000000000..7a1c813522 --- /dev/null +++ b/src/3rdparty/icc/qt_attribution.json @@ -0,0 +1,15 @@ +[ + { + "Id": "icc-sRGB-color-profile", + "Name": "sRGB color profile icc file", + "QDocModule": "qtgui", + "QtUsage": "Used in Qt Gui (Embedded into PDF/A-1b files generated by QPrinter/QPdfWriter).", + "Files": "sRGB2014.icc", + + "Description": "An ICC color profile for PDF/A-1b compatible PDF files.", + "LicenseId": "ICC License", + "License": "International Color Consortium License", + "LicenseFile": "LICENSE.txt", + "Copyright": "Copyright International Color Consortium, 2015" + } +] diff --git a/src/3rdparty/icc/sRGB2014.icc b/src/3rdparty/icc/sRGB2014.icc Binary files differnew file mode 100644 index 0000000000..49afbfef10 --- /dev/null +++ b/src/3rdparty/icc/sRGB2014.icc diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 79179daaf4..91083f84c4 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri @@ -1,5 +1,5 @@ CONFIG(release, debug|release):DEFINES *= NDEBUG -DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE +DEFINES += SQLITE_ENABLE_COLUMN_METADATA SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS qtConfig(posix_fallocate): DEFINES += HAVE_POSIX_FALLOCATE=1 winrt: DEFINES += SQLITE_OS_WINRT |