diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /mkspecs/devices/linux-jetson-tk1-g++/qmake.conf | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'mkspecs/devices/linux-jetson-tk1-g++/qmake.conf')
| -rw-r--r-- | mkspecs/devices/linux-jetson-tk1-g++/qmake.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/devices/linux-jetson-tk1-g++/qmake.conf b/mkspecs/devices/linux-jetson-tk1-g++/qmake.conf index 493b55384f..4c733e8b77 100644 --- a/mkspecs/devices/linux-jetson-tk1-g++/qmake.conf +++ b/mkspecs/devices/linux-jetson-tk1-g++/qmake.conf @@ -11,19 +11,19 @@ include(../common/linux_device_pre.conf) -QMAKE_INCDIR += \ +QMAKE_INCDIR_POST += \ $$[QT_SYSROOT]/usr/include \ $$[QT_SYSROOT]/usr/include/arm-linux-gnueabihf -QMAKE_LIBDIR += \ +QMAKE_LIBDIR_POST += \ $$[QT_SYSROOT]/usr/lib \ $$[QT_SYSROOT]/lib/arm-linux-gnueabihf \ $$[QT_SYSROOT]/usr/lib/arm-linux-gnueabihf -QMAKE_LFLAGS += \ - -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib \ - -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib/arm-linux-gnueabihf \ - -Wl,-rpath-link,$$[QT_SYSROOT]/lib/arm-linux-gnueabihf +QMAKE_RPATHLINKDIR_POST += \ + $$[QT_SYSROOT]/usr/lib \ + $$[QT_SYSROOT]/usr/lib/arm-linux-gnueabihf \ + $$[QT_SYSROOT]/lib/arm-linux-gnueabihf DISTRO_OPTS += hard-float COMPILER_FLAGS += -mtune=cortex-a15 -march=armv7-a -mfpu=neon-vfpv4 |