diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-13 10:09:19 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-13 10:09:20 +0200 |
| commit | 57fead6100c69128ef6cc483b78ba91e477e8851 (patch) | |
| tree | 241d145d647fedd587fe850a6c1b7d0dffbd6f68 /src/corelib | |
| parent | a2f6ece27f95eb7cb9940af6ba734d4ba52bf4cb (diff) | |
| parent | 6542161d5c698d461a11f0e5ca6cc2a00d33a824 (diff) | |
Merge remote-tracking branch 'origin/5.5.1' into 5.5
Change-Id: I2942591e1c1ca86ce0f6476e0a5c3033cdf861ee
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 4828d8596a..9f79b3e70c 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -572,6 +572,9 @@ # if _MSC_VER < 1900 // ICC disables unicode string support when compatibility mode with MSVC 2013 or lower is active # undef Q_COMPILER_UNICODE_STRINGS +// Even though ICC knows about ref-qualified members, MSVC 2013 or lower doesn't, so +// certain member functions (like QString::toUpper) may be missing from the DLLs. +# undef Q_COMPILER_REF_QUALIFIERS // Disable constexpr unless the MS headers have constexpr in all the right places too // (like std::numeric_limits<T>::max()) # undef Q_COMPILER_CONSTEXPR |