diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 06:14:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 06:14:45 (GMT) |
| commit | a3e7f41b085605b6856686b5dfd29818308bd820 (patch) | |
| tree | 30a18e0cc8bcc1d69f25b1b0504a5a06d7885dd1 /src/corelib/tools | |
| parent | 2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4 (diff) | |
| parent | 8f031e9c1dc4dd3b8caea646c9ea108b04f36b3c (diff) | |
| download | Qt-a3e7f41b085605b6856686b5dfd29818308bd820.zip Qt-a3e7f41b085605b6856686b5dfd29818308bd820.tar.gz Qt-a3e7f41b085605b6856686b5dfd29818308bd820.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (53 commits)
remove non wifi interfaces from being handled.
Disable auto-uppercasing and predictive text for password line edits.
Avoid QString reallocation in QTextEngine::itemize()
Remove the Qt 4.7 #if guards that were needed for 4.6
Always redraw the complete control when an input event comes in.
Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5)
Fix compilation: include QString in order to use QString.
Fix compile
Block the Maemo5 window attribute values from being assigned to something else on other platforms.
be more verbose when warning about incompatible libraries
Introduce a setAttribute_internal helper
Do not reset state too early on RMB click
Fix for QRadioButtons and QCheckBoxes drawn incorrectly when a style sheet is set.
Speed up creation of the pixmap cache key
Optimize QGtkStyle
fix qmake -project mode
test qlist some more
fix include
Don't print a warning when passing an empty string to QColor
Stabilize QWidget
...
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qsimd_p.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 3324796..c5f70b0 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -154,6 +154,10 @@ char *qstrcpy(char *dst, const char *src) This function assumes that \a dst is at least \a len characters long. + \note When compiling with Visual C++ compiler version 14.00 + (Visual C++ 2005) or later, internally the function strncpy_s + will be used. + \sa qstrcpy() */ diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 21f308d..c69dd09 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -119,6 +119,8 @@ enum CPUFeatures { Q_CORE_EXPORT uint qDetectCPUFeatures(); +Q_CORE_EXPORT uint qDetectCPUFeatures(); + QT_END_NAMESPACE QT_END_HEADER |