blob: 4dd8a8aaa538206805822de7e8d193acd835572e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
From 58e1896d80d909fcf3a4eb991c30025e75528c24 Mon Sep 17 00:00:00 2001
From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Date: Tue, 8 Feb 2011 11:36:13 +0100
Subject: [PATCH] Avoid recursively including the same arch.pri file
---
qtbase/src/corelib/arch/arch.pri | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/qtbase/src/corelib/arch/arch.pri b/qtbase/src/corelib/arch/arch.pri
index cd23e5e..5ed5a25 100644
--- a/qtbase/src/corelib/arch/arch.pri
+++ b/qtbase/src/corelib/arch/arch.pri
@@ -35,4 +35,6 @@ integrity:HEADERS += arch/qatomic_integrity.h
QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH
DEPENDPATH += $$QT_ARCH_CPP
-include($$QT_ARCH_CPP/arch.pri, "", true)
+!isEmpty(QT_ARCH) {
+ include($$QT_ARCH_CPP/arch.pri, "", true)
+}
\ No newline at end of file
--
1.7.1
|
