make mkspecs not mess up library and include search paths

adding shared install paths to QMAKE_{INCDIR,LIBDIR} in the spec has the
tiny side effect that they are searched _first_, which is generally a
really bad idea - they should be _last_.

for that purpose, make QMAKE_{INCDIR,LIBDIR}_POST live up to their names
(i.e., search them actually last) and migrate all affected specs to use
them.

Task-number: QTBUG-40825
Change-Id: Ie0de81c3cc49e193186d2fedd7d6c77590c8ef79
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

9 files changed, 18 insertions, 18 deletions

diff --git a/mkspecs/devices/common/freebsd_device_pre.conf b/mkspecs/devices/common/freebsd_device_pre.conf
index 97d70b5265..8eb76f60f1 100644
--- a/mkspecs/devices/common/freebsd_device_pre.conf
+++ b/mkspecs/devices/common/freebsd_device_pre.conf
@@ -24,4 +24,4 @@ QMAKE_STRIP             = $${CROSS_COMPILE}strip
 # it messes up system include order. --sysroot is
 # sufficient. See link for details:
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213217
-QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib
+QMAKE_LIBDIR_POST       = $$[QT_SYSROOT]/usr/lib
diff --git a/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf b/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf
index 99b8f22f97..f65e9730d0 100644
--- a/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf
+++ b/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf
@@ -19,8 +19,8 @@
 
 include(../common/linux_device_pre.conf)
 
-QMAKE_INCDIR += /usr/arm-linux-gnueabihf/include
-QMAKE_LIBDIR += /usr/arm-linux-gnueabihf/lib
+QMAKE_INCDIR_POST += /usr/arm-linux-gnueabihf/include
+QMAKE_LIBDIR_POST += /usr/arm-linux-gnueabihf/lib
 
 QMAKE_LIBS += -lrt
 
diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
index b131f65a79..5619c205fb 100644
--- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
+++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
@@ -50,9 +50,9 @@ QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
 QMAKE_NM                = $${CROSS_COMPILE}nm -P
 QMAKE_STRIP             = $${CROSS_COMPILE}strip
 
-QMAKE_INCDIR           += $${TRIDENT_SHINER_SDK_BUILDTREE}/target/output/objs/$${TRIDENT_SHINER_SDK_BUILDSPEC}/comps/generic_apps/usr/include
-QMAKE_LIBDIR           += $${TRIDENT_SHINER_SDK_BUILDTREE}/target/output/objs/$${TRIDENT_SHINER_SDK_BUILDSPEC}/comps/generic_apps/usr/lib
-QMAKE_LIBDIR           += $${TRIDENT_SHINER_SDK_BUILDTREE}/target/output/objs/$${TRIDENT_SHINER_SDK_BUILDSPEC}/comps/generated/lib/armgnu_linux_el_cortex-a9
+QMAKE_INCDIR_POST      += $${TRIDENT_SHINER_SDK_BUILDTREE}/target/output/objs/$${TRIDENT_SHINER_SDK_BUILDSPEC}/comps/generic_apps/usr/include
+QMAKE_LIBDIR_POST      += $${TRIDENT_SHINER_SDK_BUILDTREE}/target/output/objs/$${TRIDENT_SHINER_SDK_BUILDSPEC}/comps/generic_apps/usr/lib
+QMAKE_LIBDIR_POST      += $${TRIDENT_SHINER_SDK_BUILDTREE}/target/output/objs/$${TRIDENT_SHINER_SDK_BUILDSPEC}/comps/generated/lib/armgnu_linux_el_cortex-a9
 
 QMAKE_INCDIR_EGL        = $${TRIDENT_SHINER_SDK_INCDIR_EGL_OPENGL_ES2}
 QMAKE_LIBDIR_EGL        = $${TRIDENT_SHINER_SDK_LIBDIR_EGL_OPENGL_ES2}
diff --git a/mkspecs/devices/linux-drive-cx-g++/qmake.conf b/mkspecs/devices/linux-drive-cx-g++/qmake.conf
index a658f29deb..3cff38ff8b 100644
--- a/mkspecs/devices/linux-drive-cx-g++/qmake.conf
+++ b/mkspecs/devices/linux-drive-cx-g++/qmake.conf
@@ -16,11 +16,11 @@
 
 include(../common/linux_device_pre.conf)
 
-QMAKE_INCDIR += \
+QMAKE_INCDIR_POST += \
     $${VIBRANTE_SDK_TOPDIR}/include \
     $$[QT_SYSROOT]/usr/include
 
-QMAKE_LIBDIR += \
+QMAKE_LIBDIR_POST += \
     $${VIBRANTE_SDK_TOPDIR}/lib-target \
     $$[QT_SYSROOT]/usr/lib \
     $$[QT_SYSROOT]/lib/aarch64-linux-gnu \
diff --git a/mkspecs/devices/linux-jetson-tk1-g++/qmake.conf b/mkspecs/devices/linux-jetson-tk1-g++/qmake.conf
index 493b55384f..32996f59e6 100644
--- a/mkspecs/devices/linux-jetson-tk1-g++/qmake.conf
+++ b/mkspecs/devices/linux-jetson-tk1-g++/qmake.conf
@@ -11,11 +11,11 @@
 
 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
diff --git a/mkspecs/devices/linux-jetson-tk1-pro-g++/qmake.conf b/mkspecs/devices/linux-jetson-tk1-pro-g++/qmake.conf
index 1f44c47151..64b25e0182 100644
--- a/mkspecs/devices/linux-jetson-tk1-pro-g++/qmake.conf
+++ b/mkspecs/devices/linux-jetson-tk1-pro-g++/qmake.conf
@@ -14,11 +14,11 @@
 
 include(../common/linux_device_pre.conf)
 
-QMAKE_INCDIR += \
+QMAKE_INCDIR_POST += \
     $${VIBRANTE_SDK_TOPDIR}/include \
     $$[QT_SYSROOT]/usr/include
 
-QMAKE_LIBDIR += \
+QMAKE_LIBDIR_POST += \
     $${VIBRANTE_SDK_TOPDIR}/lib-target \
     $$[QT_SYSROOT]/usr/lib \
     $$[QT_SYSROOT]/lib/arm-linux-gnueabihf \
diff --git a/mkspecs/devices/linux-jetson-tx1-g++/qmake.conf b/mkspecs/devices/linux-jetson-tx1-g++/qmake.conf
index 06cf329f3a..f45be457fd 100644
--- a/mkspecs/devices/linux-jetson-tx1-g++/qmake.conf
+++ b/mkspecs/devices/linux-jetson-tx1-g++/qmake.conf
@@ -25,11 +25,11 @@
 
 include(../common/linux_device_pre.conf)
 
-QMAKE_INCDIR += \
+QMAKE_INCDIR_POST += \
     $$[QT_SYSROOT]/usr/include \
     $$[QT_SYSROOT]/usr/include/aarch64-linux-gnu
 
-QMAKE_LIBDIR += \
+QMAKE_LIBDIR_POST += \
     $$[QT_SYSROOT]/usr/lib \
     $$[QT_SYSROOT]/lib/aarch64-linux-gnu \
     $$[QT_SYSROOT]/usr/lib/aarch64-linux-gnu
diff --git a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
index 9211551daf..2a4e558186 100644
--- a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
+++ b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
@@ -52,8 +52,8 @@ QMAKE_LIBDIR_OPENGL_ES2 = $${BRCM_ROCKFORD_PATH}/middleware/v3d/lib_$${BRCM_PLAT
 QMAKE_LIBS_OPENGL_ES2   = -lv3ddriver -lrt
 QMAKE_LIBS_EGL          =
 
-INCLUDEPATH            += $${BRCM_APPLIBS_PATH}/opensource/zlib/zlib-1.2.3
-QMAKE_LIBDIR           += $${BRCM_APPLIBS_PATH}/opensource/zlib/zlib-1.2.3
+QMAKE_INCDIR_POST      += $${BRCM_APPLIBS_PATH}/opensource/zlib/zlib-1.2.3
+QMAKE_LIBDIR_POST      += $${BRCM_APPLIBS_PATH}/opensource/zlib/zlib-1.2.3
 
 QMAKE_LFLAGS           += -Wl,-rpath-link,$$QMAKE_LIBDIR_OPENGL_ES2  -Wl,-rpath-link,$${BRCM_APPLIBS_PATH}/opensource/zlib/zlib-1.2.3
 
diff --git a/mkspecs/devices/linux-tegra2-g++/qmake.conf b/mkspecs/devices/linux-tegra2-g++/qmake.conf
index adadc4d5b0..4db576d791 100644
--- a/mkspecs/devices/linux-tegra2-g++/qmake.conf
+++ b/mkspecs/devices/linux-tegra2-g++/qmake.conf
@@ -10,9 +10,9 @@
 
 include(../common/linux_device_pre.conf)
 
-QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR_POST      += $$[QT_SYSROOT]/usr/include
 
-QMAKE_LIBDIR           += $$[QT_SYSROOT]/usr/lib \
+QMAKE_LIBDIR_POST      += $$[QT_SYSROOT]/usr/lib \
                           $$[QT_SYSROOT]/lib/arm-linux-gnueabi \
                           $$[QT_SYSROOT]/usr/lib/arm-linux-gnueabi