From 7bf37d966e062790ff04a51a860a16eb52d46838 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 10 Feb 2012 14:34:12 +0100 Subject: Cleanup HEADERS+=... in src/corelib/arch/arch.pri Include all qatomic_*.h files in HEADERS, since we don't know which include the compiler will end up choosing in the end (operating system specific includes are still conditionally included, though). Change-Id: I4241e40ad51d34dede04be0c4ee95378d6f3d037 Reviewed-by: Thiago Macieira --- src/corelib/arch/arch.pri | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index 14e90b8736..cb2102cefd 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -1,29 +1,24 @@ -win32:HEADERS += arch/qatomic_msvc.h - -win32-g++*:HEADERS += arch/qatomic_i386.h \ - arch/qatomic_x86_64.h - -mac:HEADERS += arch/qatomic_i386.h \ - arch/qatomic_x86_64.h - +win32|wince:HEADERS += arch/qatomic_msvc.h vxworks:HEADERS += arch/qatomic_vxworks.h - integrity:HEADERS += arch/qatomic_integrity.h -!wince*:!win32:!mac:HEADERS += arch/qatomic_alpha.h \ - arch/qatomic_ia64.h \ - arch/qatomic_sparc.h \ - arch/qatomic_powerpc.h \ - arch/qatomic_armv5.h \ - arch/qatomic_armv6.h \ - arch/qatomic_armv7.h \ - arch/qatomic_i386.h \ - arch/qatomic_mips.h \ - arch/qatomic_s390.h \ - arch/qatomic_x86_64.h \ - arch/qatomic_sh4a.h \ - arch/qatomic_gcc.h \ - arch/qatomic_cxx11.h +HEADERS += \ + arch/qatomic_alpha.h \ + arch/qatomic_armv5.h \ + arch/qatomic_armv6.h \ + arch/qatomic_armv7.h \ + arch/qatomic_bfin.h \ + arch/qatomic_bootstrap.h \ + arch/qatomic_i386.h \ + arch/qatomic_ia64.h \ + arch/qatomic_mips.h \ + arch/qatomic_powerpc.h \ + arch/qatomic_s390.h \ + arch/qatomic_sh4a.h \ + arch/qatomic_sparc.h \ + arch/qatomic_x86_64.h \ + arch/qatomic_gcc.h \ + arch/qatomic_cxx11.h unix { # fallback implementation when no other appropriate qatomic_*.h exists -- cgit v1.2.3