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 /src/3rdparty | |
| 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 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/atspi2/xml/Cache.xml | 4 | ||||
| -rw-r--r-- | src/3rdparty/freetype_dependency.pri | 3 | ||||
| -rw-r--r-- | src/3rdparty/sha3/KeccakF-1600-interface.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/xkbcommon.pri | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/3rdparty/atspi2/xml/Cache.xml b/src/3rdparty/atspi2/xml/Cache.xml index 9d0c5801a9..01c52810ac 100644 --- a/src/3rdparty/atspi2/xml/Cache.xml +++ b/src/3rdparty/atspi2/xml/Cache.xml @@ -9,12 +9,12 @@ <signal name="AddAccessible"> <arg name="nodeAdded" type="((so)(so)a(so)assusau)"/> - <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiAccessibleCacheItem"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiAccessibleCacheItem"/> </signal> <signal name="RemoveAccessible"> <arg name="nodeRemoved" type="(so)"/> - <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/> </signal> </interface> 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/3rdparty/sha3/KeccakF-1600-interface.h b/src/3rdparty/sha3/KeccakF-1600-interface.h index ce2710eeb2..39caaaecbd 100644 --- a/src/3rdparty/sha3/KeccakF-1600-interface.h +++ b/src/3rdparty/sha3/KeccakF-1600-interface.h @@ -14,7 +14,11 @@ http://creativecommons.org/publicdomain/zero/1.0/ #ifndef _KeccakPermutationInterface_h_ #define _KeccakPermutationInterface_h_ +#include <private/qglobal_p.h> + +#if QT_CONFIG(sha3_fast) #include "KeccakF-1600-int-set.h" +#endif static void KeccakInitialize( void ); static void KeccakInitializeState(unsigned char *state); diff --git a/src/3rdparty/xkbcommon.pri b/src/3rdparty/xkbcommon.pri index 12e7a4d8a3..af71b232d5 100644 --- a/src/3rdparty/xkbcommon.pri +++ b/src/3rdparty/xkbcommon.pri @@ -4,6 +4,8 @@ INCLUDEPATH += $$PWD/xkbcommon \ $$PWD/xkbcommon/src \ $$PWD/xkbcommon/src/xkbcomp +include($$shadowed($$PWD/../gui/qtgui-config.pri)) + DEFINES += DFLT_XKB_CONFIG_ROOT='\\"$$QMAKE_XKB_CONFIG_ROOT\\"' ### RMLVO names can be overwritten with environmental variables (see libxkbcommon documentation) |