diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:35:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 16:27:28 +0100 |
| commit | a15c3d086dafea83e4760f0b447be43d26b80697 (patch) | |
| tree | fd224a3f83942ff4c432e1e3a3f8583d14d6a11c /src/3rdparty | |
| parent | 87abfd351af6309691d921ca0aef077d74df4732 (diff) | |
| parent | 397061a6a92db9f962360d5db96f69b315f93074 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
src/dbus/qdbusconnection_p.h
src/dbus/qdbusintegrator.cpp
src/dbus/qdbusintegrator_p.h
tests/auto/corelib/io/qdir/qdir.pro
tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/dbus-ifaces/org.kde.StatusNotifierItem.xml | 8 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/3rdparty/dbus-ifaces/org.kde.StatusNotifierItem.xml b/src/3rdparty/dbus-ifaces/org.kde.StatusNotifierItem.xml index aeeb42fa87..1cbd78a9c3 100644 --- a/src/3rdparty/dbus-ifaces/org.kde.StatusNotifierItem.xml +++ b/src/3rdparty/dbus-ifaces/org.kde.StatusNotifierItem.xml @@ -19,13 +19,13 @@ <property name="IconName" type="s" access="read"/> <!--struct containing width, height and image data--> - <property name="IconPixmap" type="(iiay)" access="read"> + <property name="IconPixmap" type="a(iiay)" access="read"> <annotation name="org.qtproject.QtDBus.QtTypeName" value="QXdgDBusImageVector"/> </property> <property name="OverlayIconName" type="s" access="read"/> - <property name="OverlayIconPixmap" type="(iiay)" access="read"> + <property name="OverlayIconPixmap" type="a(iiay)" access="read"> <annotation name="org.qtproject.QtDBus.QtTypeName" value="QXdgDBusImageVector"/> </property> @@ -34,7 +34,7 @@ <property name="AttentionIconName" type="s" access="read"/> <!--same definition as image--> - <property name="AttentionIconPixmap" type="(iiay)" access="read"> + <property name="AttentionIconPixmap" type="a(iiay)" access="read"> <annotation name="org.qtproject.QtDBus.QtTypeName" value="QXdgDBusImageVector"/> </property> @@ -45,7 +45,7 @@ <!-- tooltip data --> <!--(iiay) is an image--> - <property name="ToolTip" type="(s(iiay)ss)" access="read"> + <property name="ToolTip" type="(sa(iiay)ss)" access="read"> <annotation name="org.qtproject.QtDBus.QtTypeName" value="QXdgDBusToolTipStruct"/> </property> diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index 031f7ecd58..edfc0e7954 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -15,6 +15,9 @@ DEFINES += HAVE_ATEXIT unix: DEFINES += HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD win32: DEFINES += HB_NO_WIN1256 +#Workaround https://code.google.com/p/android/issues/detail?id=194631 +android: DEFINES += _POSIX_C_SOURCE=200112L + INCLUDEPATH += $$PWD/include INCLUDEPATH += $$QT.core.includes |