diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-05-12 14:50:42 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-05-13 11:23:25 +0000 |
commit | 406934a6323d37d879fa1ce4894a62635c2ec834 (patch) | |
tree | 1c7d66084e6e0266c39c6936039ea2936e098aa5 /mkspecs/devices/linux-imx6-g++ | |
parent | 6c20a01cb9032a6abc0b82549a4242e2441894f7 (diff) |
Purge default locations from commonly used device makespecs
Including /usr/include and lib can cause cryptic failures if there is
already a Qt installed to /usr.
Having standard locations listed should not be necessary at all.
Change-Id: I08a15a064cc1aec126733f7e1962a2fa2ec38fcb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'mkspecs/devices/linux-imx6-g++')
-rw-r--r-- | mkspecs/devices/linux-imx6-g++/qmake.conf | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf index 1646c5fe77..71e37845c3 100644 --- a/mkspecs/devices/linux-imx6-g++/qmake.conf +++ b/mkspecs/devices/linux-imx6-g++/qmake.conf @@ -4,15 +4,10 @@ include(../common/linux_device_pre.conf) -QMAKE_INCDIR += $$[QT_SYSROOT]/usr/include -QMAKE_LIBDIR += $$[QT_SYSROOT]/usr/lib - QMAKE_LIBS_EGL += -lEGL QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL -QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib - IMX6_CFLAGS = -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 QMAKE_CFLAGS += $$IMX6_CFLAGS QMAKE_CXXFLAGS += $$IMX6_CFLAGS |