diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-02 14:23:32 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 08:52:42 +0100 |
| commit | 0160f58d4ba5efd3beacaca3ce122554a90f1eb4 (patch) | |
| tree | 8de39cce9c9cf395bcde1b42aa9ded5a724ab8f4 /src/corelib/arch/arch.pri | |
| parent | a3be9bd9c4f329b1c3fe5c9c492b6279828c50d3 (diff) | |
Rename qatomic_windows.h to qatomic_msvc.h
The QT_ARCH_WINDOWS(CE) define(s) aren't used to control which
header to include anymore, so just remove it. We also do not need
the empty src/corelib/arch/windows/arch.pri.
Change-Id: I5400fc852af31907e533d0278540b8cd3da391cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/arch/arch.pri')
| -rw-r--r-- | src/corelib/arch/arch.pri | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index c40b383622..cd504b1d75 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -1,4 +1,4 @@ -win32:HEADERS += arch/qatomic_windows.h \ +win32:HEADERS += arch/qatomic_msvc.h \ arch/qatomic_generic.h win32-g++*:HEADERS += arch/qatomic_i386.h \ @@ -35,7 +35,7 @@ integrity:HEADERS += arch/qatomic_integrity.h arch/qatomic_cxx11.h QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH -DEPENDPATH += $$QT_ARCH_CPP -!isEmpty(QT_ARCH) { - include($$QT_ARCH_CPP/arch.pri, "", true) +exists($$QT_ARCH_CPP) { + DEPENDPATH += $$QT_ARCH_CPP + include($$QT_ARCH_CPP/arch.pri, "", true) } |