diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
| commit | e281537f2049af0b96fd87158f2b7212afe8ab5f (patch) | |
| tree | 7f9e3b14a2456cc779aa165457192094507dd257 /src/corelib/global/qcompilerdetection.h | |
| parent | e0a8b5ce88bc50440dcec2fe3a86d83e2a7dc7b0 (diff) | |
| parent | 84569773db68408704193268bc42a200bb25a924 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/qglobal.h
src/platformsupport/platformcompositor/qopenglcompositor.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I5422868500be695584a496dbbbc719d146bc572d
Diffstat (limited to 'src/corelib/global/qcompilerdetection.h')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 44356e6232..e0fa45b45e 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -154,17 +154,17 @@ /* Clang also masquerades as GCC */ # if defined(__apple_build_version__) # /* http://en.wikipedia.org/wiki/Xcode#Toolchain_Versions */ -# if __apple_build_version__ >= 600051 +# if __apple_build_version__ >= 6000051 # define Q_CC_CLANG 305 -# elif __apple_build_version__ >= 503038 +# elif __apple_build_version__ >= 5030038 # define Q_CC_CLANG 304 -# elif __apple_build_version__ >= 500275 +# elif __apple_build_version__ >= 5000275 # define Q_CC_CLANG 303 -# elif __apple_build_version__ >= 425024 +# elif __apple_build_version__ >= 4250024 # define Q_CC_CLANG 302 -# elif __apple_build_version__ >= 318045 +# elif __apple_build_version__ >= 3180045 # define Q_CC_CLANG 301 -# elif __apple_build_version__ >= 211101 +# elif __apple_build_version__ >= 2111001 # define Q_CC_CLANG 300 # else # error "Unknown Apple Clang version" |