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 /mkspecs/devices | |
| 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 'mkspecs/devices')
| -rw-r--r-- | mkspecs/devices/common/linux_device_pre.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf index cfbdc23d63..8c6c87d0b7 100644 --- a/mkspecs/devices/common/linux_device_pre.conf +++ b/mkspecs/devices/common/linux_device_pre.conf @@ -25,4 +25,4 @@ QMAKE_NM = $${CROSS_COMPILE}nm -P QMAKE_STRIP = $${CROSS_COMPILE}strip contains(DISTRO_OPTS, deb-multi-arch): \ - PKG_CONFIG = $${CROSS_COMPILE}pkg-config + QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config |