projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8e4fc36
)
Avoid recursively including the same arch.pri file
author
Prasanth Ullattil
<prasanth.ullattil@nokia.com>
Tue, 8 Feb 2011 10:36:13 +0000
(11:36 +0100)
committer
axis
<qt-info@nokia.com>
Wed, 27 Apr 2011 10:05:57 +0000
(12:05 +0200)
src/corelib/arch/arch.pri
patch
|
blob
|
history
diff --git
a/src/corelib/arch/arch.pri
b/src/corelib/arch/arch.pri
index
cd23e5e
..
5ed5a25
100644
(file)
--- 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