diff options
Diffstat (limited to 'config.tests')
| -rwxr-xr-x | config.tests/unix/makeabs | 8 | ||||
| -rw-r--r-- | config.tests/unix/openssl/openssl.pri | 11 |
2 files changed, 9 insertions, 10 deletions
diff --git a/config.tests/unix/makeabs b/config.tests/unix/makeabs index 9d66108..c415cc7 100755 --- a/config.tests/unix/makeabs +++ b/config.tests/unix/makeabs @@ -3,7 +3,13 @@ FILE="$1" RES="$FILE" -if [ `echo $FILE | cut -b1` = "/" ]; then +CUT_ARG="-b1" +if [ `uname -s` = "QNX" ]; then + # QNX does not understand "-b1" + CUT_ARG="-c1" +fi + +if [ `echo $FILE | cut $CUT_ARG` = "/" ]; then true else RES="$PWD/$FILE" diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri index c8703c2..377d630 100644 --- a/config.tests/unix/openssl/openssl.pri +++ b/config.tests/unix/openssl/openssl.pri @@ -1,12 +1,5 @@ -!cross_compile { - TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH - # LSB doesn't allow using headers from /include or /usr/include - linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH - for(p, TRY_INCLUDEPATHS) { - pp = $$join(p, "", "", "/openssl") - exists($$pp):INCLUDEPATH *= $$p - } -} +# Empty file since Qt 4.6 +# I'm too lazy to find all places where this file is included symbian{ TRY_INCLUDEPATHS = $${EPOCROOT}epoc32 $${EPOCROOT}epoc32/include $${EPOCROOT}epoc32/include/stdapis $${EPOCROOT}epoc32/include/stdapis/sys $$OS_LAYER_LIBC_SYSTEMINCLUDE $$QMAKE_INCDIR $$INCLUDEPATH |