diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:52:17 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:52:17 (GMT) |
| commit | 58563dcb2cab0949d21337b7b7cd34e3bdd29bbc (patch) | |
| tree | 2715d69c247748ba1501e50ec432415d3ffebcae /src/corelib/io | |
| parent | 564f65bdcf42bcdaceea902b99bcbfafef5b97f3 (diff) | |
| parent | 2dc7fae7ea38a0169c4c5c78d0534d688347aacb (diff) | |
| download | Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.zip Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.tar.gz Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qdatastream.h | 3 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_symbian.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_symbian_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/io/qprocess_symbian.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index bd418b9..f8e0608 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -84,7 +84,8 @@ public: Qt_4_3 = 9, Qt_4_4 = 10, Qt_4_5 = 11, - Qt_4_6 = 12 + Qt_4_6 = 12, + Qt_4_7 = Qt_4_6 #if QT_VERSION >= 0x040800 #error Add the datastream version for this Qt version Qt_4_8 = Qt_4_7 diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp index a07d084..d738c18 100644 --- a/src/corelib/io/qfilesystemwatcher_symbian.cpp +++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtCore of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/corelib/io/qfilesystemwatcher_symbian_p.h b/src/corelib/io/qfilesystemwatcher_symbian_p.h index 456d18b..edba47c 100644 --- a/src/corelib/io/qfilesystemwatcher_symbian_p.h +++ b/src/corelib/io/qfilesystemwatcher_symbian_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtCore of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp index d93cdba..f5de750 100644 --- a/src/corelib/io/qprocess_symbian.cpp +++ b/src/corelib/io/qprocess_symbian.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtCore of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |