summaryrefslogtreecommitdiffstats
path: root/config.tests/unix
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-30 10:58:06 (GMT)
committerPeter Hartmann <peter.hartmann@trolltech.com>2009-08-05 11:18:15 (GMT)
commitcb599c5ea32e8e5ff81318038b432272f107b1fe (patch)
tree227c638324985d111d153747ba93661b9ef89237 /config.tests/unix
parent5f52d473eec0f1b46200b06dd7f5e16cb5c57c05 (diff)
downloadQt-cb599c5ea32e8e5ff81318038b432272f107b1fe.zip
Qt-cb599c5ea32e8e5ff81318038b432272f107b1fe.tar.gz
Qt-cb599c5ea32e8e5ff81318038b432272f107b1fe.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 (cherry picked from commit 04f7834fcd8db4ecb6a4c53de42ac83f571b37c8)
Diffstat (limited to 'config.tests/unix')
-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
+