diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-04-29 13:26:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-10 01:12:40 +0200 |
| commit | 1b2d3be446df492c009bd575637a0f103241ce4d (patch) | |
| tree | fafa5aa93c85f701ff33a291cd12493c93370af7 /src/corelib/global/qglobal.h | |
| parent | 95fe97dbcb4a4ce81b80eaf7c45a1106dd860271 (diff) | |
Sanitize QT_COMPILER_SUPPORTS_xxx in qcompilerdetection.h
... instead of scoping the defines in qconfig.h, which relied on the
Q_PROCESSOR_xxx defines and meant that we had to include qconfig.h
after qprocessordetection.h, which added a whole bunch of other
dependency issues.
We now let configure write QT_COMPILER_SUPPORTS_xxx to qconfig.h as
before, without any scoping, and then undefine the ones that don't
apply for the given processor. This means we need to include
qprocessordetection.h before qcompilerdetection.h in qglobal.h,
but the former does not depend on the latter, so this should be
fine.
Change-Id: If00c00d405463e9626fa0f7f5e6b17f68778904f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index c50235767a..0d8a5b1428 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -68,8 +68,8 @@ #define QT_STRINGIFY(x) QT_STRINGIFY2(x) #include <QtCore/qsystemdetection.h> -#include <QtCore/qcompilerdetection.h> #include <QtCore/qprocessordetection.h> +#include <QtCore/qcompilerdetection.h> #if defined (__ELF__) # define Q_OF_ELF |