diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 21:39:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 21:39:15 (GMT) |
| commit | 7474ad656269aec1352d166bb5a4435086d48482 (patch) | |
| tree | 2791036aa8644ab759dc81eb7317de78589026a9 /src/corelib | |
| parent | 7a413f40f8db4f20277f153c1e771da478a5e991 (diff) | |
| parent | 5762a988fbcd95c9c44e58993c25f5cd1d53f897 (diff) | |
| download | Qt-7474ad656269aec1352d166bb5a4435086d48482.zip Qt-7474ad656269aec1352d166bb5a4435086d48482.tar.gz Qt-7474ad656269aec1352d166bb5a4435086d48482.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use a shared QScriptEngine for debugger console command scripts
Fix QtScript debugger hang/crash issue with updating locals model
doc: Fixed some qdoc warnings.
Always activate popup windows on show
doc: Fixed some qdoc warnings.
Add the QMAKE_FILE_EXT variable to extra compilers generation.
Cocoa: Tool Windows steal focus from the main window
qdoc3: Removed a debug output.
Update QTestLib documentation with chart use case.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qdatastream.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 27f7632..7c1887e 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -571,6 +571,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_4_4 Version 10 (Qt 4.4) \value Qt_4_5 Version 11 (Qt 4.5) \value Qt_4_6 Version 12 (Qt 4.6) + \value Qt_4_7 Same as Qt_4_6. \sa setVersion(), version() */ diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 3a51cf8..d23ea4c 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -272,7 +272,6 @@ QT_BEGIN_NAMESPACE \omitvalue MacGLClearDrawable \omitvalue NetworkReplyUpdated \omitvalue FutureCallOut - \omitvalue CocoaRequestModal \omitvalue UpdateSoftKeys \omitvalue NativeGesture */ diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 6c87a86..a27e488 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -1061,7 +1061,7 @@ QByteArray &QByteArray::operator=(const char *str) \internal */ -/*! \fn bool QByteArray::isSharedWith(const QByteArray &other) +/*! \fn bool QByteArray::isSharedWith(const QByteArray &other) const \internal */ |