diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnumeric_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 9ca023a2ca..7fd76be3ca 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -145,7 +145,7 @@ attribute is true, Qt will not do the flip. \l QKeySequence::StandardKey will also flip accordingly (i.e., QKeySequence::Copy will be Command+C on the keyboard regardless of the value set, though what is output for - QKeySequence::toString(QKeySequence::PortableText) will be different). + QKeySequence::toString() will be different). \value AA_Use96Dpi Assume the screen has a resolution of 96 DPI rather than using the OS-provided resolution. This will cause font rendering diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h index 8ff4ffc7a7..a6b01b796f 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -50,7 +50,7 @@ #include <cmath> #include <limits> -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) +#if defined(Q_CC_MSVC) && !defined(Q_OS_WINCE) # include <intrin.h> #elif defined(Q_CC_INTEL) # include <immintrin.h> // for _addcarry_u<nn> |