From d6ab68fbd22b2d057b0e32e1bfc73a5e7dc9327d Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@nokia.com>
Date: Mon, 15 Mar 2010 12:00:02 +0100
Subject: Force qt-zlib to be used for host system when cross compiling.

There is no possibility to define which zlib should be used for the
bootstrapped tools when cross compiling.
Therefor we will force qt-zlib to be used for bootstrapped tools.

Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-8678
---
 src/tools/bootstrap/bootstrap.pri | 2 +-
 src/tools/bootstrap/bootstrap.pro | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index b3ee948..6442526 100644
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -51,7 +51,7 @@ hpux-acc*|hpuxi-acc* {
     }
     LIBS += -lbootstrap
 }
-!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) {
+!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile {
    unix:LIBS += -lz
 #  win32:LIBS += libz.lib
 }
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 0dbb90f..7e91333 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -95,7 +95,7 @@ macx: {
    LIBS += -framework CoreServices
 }
 
-contains(QT_CONFIG, zlib) {
+contains(QT_CONFIG, zlib)|cross_compile {
    INCLUDEPATH += ../../3rdparty/zlib
    SOURCES+= \
         ../3rdparty/zlib/adler32.c \
-- 
cgit v0.12