summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-30 10:58:06 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-30 11:22:53 (GMT)
commit04f7834fcd8db4ecb6a4c53de42ac83f571b37c8 (patch)
treefdc8818f50e41cbd8d4ffde5c1653242a3a7889e
parentfbe103bd39fcef2b873aae31dcfee9604237a95e (diff)
downloadQt-04f7834fcd8db4ecb6a4c53de42ac83f571b37c8.zip
Qt-04f7834fcd8db4ecb6a4c53de42ac83f571b37c8.tar.gz
Qt-04f7834fcd8db4ecb6a4c53de42ac83f571b37c8.tar.bz2
Fix compilation on AIX: -I/usr/include cannot be used.
The reason is that the C++ compiler needs to add -I/usr/vacpp/include before -I/usr/include, so our adding of -I/usr/include changes the order. This causes a compilation error in the C++ header xlocinfo.h. In any case, these checks done in qmake are unnecessary. If the OpenSSL headers are in one of those include paths, they will be found on their own already. Reviewed-By: Bradley T. Hughes
-rw-r--r--config.tests/unix/openssl/openssl.pri12
1 files changed, 3 insertions, 9 deletions
diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
index bc95479..f069396 100644
--- a/config.tests/unix/openssl/openssl.pri
+++ b/config.tests/unix/openssl/openssl.pri
@@ -1,9 +1,3 @@
-!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
+