summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrasanth Ullattil <prasanth.ullattil@nokia.com>2011-02-08 11:36:13 +0100
committeraxis <qt-info@nokia.com>2011-04-27 12:05:57 +0200
commitd7ce3d25bc13512a3aeff51349ddb387ecc1822f (patch)
tree669343a69a71d36a4493e594bb6e16aeb7726bc4
parent8e4fc361a55c54fbaf5c813a5f3f344fd394bcaa (diff)
Avoid recursively including the same arch.pri file
-rw-r--r--src/corelib/arch/arch.pri4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri
index cd23e5e855..5ed5a25a4d 100644
--- a/src/corelib/arch/arch.pri
+++ b/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