summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-25135-1282/+8633
|\ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf tools/configure/configureapp.cpp
| * animations: make sure setCurrentTime is called on all animationsThierry Bastian2009-08-251-2/+5
| | | | | | | | | | | | | | | | The problem was we were iterating over the list of running animations. And when calling setCurrentTime(<duration>) on one of them they just unregister themselves from the timer and we would miss some of them. Reviewed-by: leo
| * Removed redundant QLocale code from QCoeFepInputContext.axis2009-08-252-3/+6
| | | | | | | | | | | | We export one extra private symbol from QtCore instead, and use that. RevBy: Miikka Heikkinen
| * Merge commit 'origin/master' into 4.6Jason Barron2009-08-2514-308/+332
| |\
| | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-246-35/+39
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfilesystemwatcher_symbian.cpp
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-2431-310/+839
| | | |\
| | | * | Make the singleton file server session independent of QCoreApplicationShane Kearns2009-08-246-35/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After review comments, changed the file server session from a member of QCoreApplication to a Q_GLOBAL_STATIC, because some applications will want to access files before constructing the QApplication. Reviewed-By: Janne Anttila
| | * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-2424-239/+791
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_unix.cpp
| | * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-2136-751/+949
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfilesystemwatcher_symbian.cpp src/corelib/io/qfilesystemwatcher_symbian_p.h
| | * | | | Review inspired changes to Symbian QProcessMiikka Heikkinen2009-08-212-170/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed two classes to conform to Qt conventions - Cosmetic changes. Reviewed-by: Janne Koskinen
| | * | | | Review inspired changes to Symbian file system watcherMiikka Heikkinen2009-08-212-55/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added retry to failed notification request. - Removed superfluous New method. - Cosmetic changes. Reviewed-by: Janne Koskinen
| | * | | | Review inspired fixes to Symbian file engineMiikka Heikkinen2009-08-216-50/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactored symbian specific public method out of qfsfileengine.h into a static method. - Utilized PathInfo class for getting home, root, and temp paths. - Cosmetic changes. Reviewed-by: Janne Koskinen
| * | | | | Merge branch '4.6'Thiago Macieira2009-08-249-27/+110
| |\ \ \ \ \
| | * | | | | Reset dangling handle after close on WinCE 5João Abecasis2009-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Maurice Kalinowski
| | * | | | | Always check the file handle before attempting to map the fileJoão Abecasis2009-08-241-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Maurice Kalinowski
| | * | | | | QFSFileEngine: Don't close file if we already have a file for mappingJoão Abecasis2009-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Maurice Kalinowski
| | * | | | | qglobal.h now has the definition for WINVERThierry Bastian2009-08-241-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It became useless to have it for mingw here
| | * | | | | Minor documentation and code fixes.Frans Englich2009-08-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses S60 review comments. Reviewed-by: TrustMe
| | * | | | | fix warning in qthread_win.cppJoerg Bornemann2009-08-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | _WIN32_WINNT is now defined in qglobal.h
| | * | | | | QFSFileEngine compile fix for NTFS symlink supportJoerg Bornemann2009-08-241-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also reverts my panic compile fixes, which just disabled the symlink code paths on Windows. This reverts commit e5fe8b49b08a6e749bde8581d9267ddafa7c9990. This reverts commit 7385c1fc7fe03836ed42cc783e840557d267cff9.
| | * | | | | define WINVER and _WIN32_WINNT in qglobal.hJoerg Bornemann2009-08-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We define these values now in qglobal.h as 0x0500, which is Windows 2k, the oldest version we will support. Reviewed-by: mariusSO
| | * | | | | Fix the last fix to QList.Thiago Macieira2009-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | | Removed superfluous status change.axis2009-08-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The service provider (RTimer) will do it for us. RevBy: Iain AutoTest: Passed
| | * | | | | Remove QScopedCustomPointerHarald Fernengel2009-08-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QScopedPointer with a custom deleter instead, so we can remove the awful QScopedCustomPointer once and for all :) Reviewed-by: Thiago
| | * | | | | Restore QList backward compatibilityHarald Fernengel2009-08-242-3/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add detach3 and append2, leaving the old functions as they were. This ensures that new code will use the optimized version of QList, and old code will just continue calling the old functions. Reviewed-by: Thiago
| | * | | | | Revert "Remove the unnecessary double memcpy now too."Harald Fernengel2009-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 10a0ed3f2e6a71eced5f470f1c3e09d7be58bbc9.
| | * | | | | Revert "Fix trivial QList detaching: QListData::detach2() *must* memcpy."Harald Fernengel2009-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7a7ea0219f6ebb9f7833649ec76e077796be1843.
| | * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6axis2009-08-242-0/+12
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Added some internal docs to make the class clearer.axis2009-08-211-0/+6
| | | | | | |
| | | * | | | Merge branch 'symbolVisibility'Iain2009-08-211-0/+6
| | | |\ \ \ \
| | | | * \ \ \ Merge commit 'origin/master' into symbolVisibilityIain2009-08-2142-777/+1015
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge commit 'origin/master' into symbolVisibilityIain2009-08-2023-70/+180
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | * | | | | New definition for ...EXPORT_INLINE to deal with the way we drive RVCTIain2009-08-191-0/+6
| | | | | | | | |
| * | | | | | | | Fix Qt::ClickFocus for QGraphicsProxyWidget.Andreas Aardal Hanssen2009-08-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes click-focus for the Embedded Dialogs demo and the Pad Navigator demo. In Qt 4.6, the behavior of the spontaneous-bit in events has changed. This has happened in a number of submits that also modify Graphics View to have the correct behavior. Somewhere on the line, the spontaneous bit has been reset, preventing QApplicationPrivate's ClickFocus handling to kick in. This again causes the Embedded Dialogs demo to not give focus to widgets that are clicked. This fix is not likely to be 100% correct. What it does is ensure that the spont-bit survives a call to qt_sendSpontaneousEvent (as this bit is for some reason reset at the end of QApplicationPrivate::notify_helper), and this fixes the most apparent regression in ClickFocus handling. Pending closer review. The fix includes an autotest that should be kept if the fix is reverted. Reviewed-by: bnilsen
| * | | | | | | | Minor documentation and code fixes.Frans Englich2009-08-241-2/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses S60 review comments. Reviewed-by: TrustMe
| * | | | | | | Remove the unnecessary double memcpy now too.Thiago Macieira2009-08-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit reintroduced memcpy in detach2(). So we don't need to do memcpy here. Re-add the memcpy when detach3() is introduced.
| * | | | | | | Don't access usedHashFunc() if it's already been deleted.Thiago Macieira2009-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem spotted in Designer: ==13197== Invalid read of size 4 ==13197== at 0x5C9AD2A: QHash<QString, QConfFile*>::isEmpty() const (qhash.h:283) ==13197== by 0x5C98142: QHash<QString, QConfFile*>::remove(QString const&) (qhash.h:769) ==13197== by 0x5C8C9FF: QConfFile::~QConfFile() (qsettings.cpp:226) ==13197== by 0x5C9238E: QConfFileSettingsPrivate::~QConfFileSettingsPrivate() (qsettings.cpp:1228) ==13197== by 0x5C9D7AA: QScopedPointerDeleter<QObjectData>::cleanup(QObjectData*) (qscopedpointer.h:62) ==13197== by 0x5CF11A4: QScopedPointer<QObjectData, QScopedPointerDeleter<QObjectData> >::~QScopedPointer() (qscopedpointer.h:100) ==13197== by 0x5CE9B46: QObject::~QObject() (qobject.cpp:992) ==13197== by 0x5C95C90: QSettings::~QSettings() (qsettings.cpp:2754) ==13197== by 0x5CC1FDC: LibraryData::~LibraryData() (qlibrary.cpp:428) ==13197== by 0x5CC2441: QGlobalStaticDeleter<LibraryData>::~QGlobalStaticDeleter() (qglobal.h:1767) ==13197== by 0x5FE16DE: __run_exit_handlers (exit.c:78) ==13197== by 0x5FE174E: exit (exit.c:100) ==13197== by 0x5FCBA3D: (below main) (libc-start.c:252) ==13197== Address 0x0 is not stack'd, malloc'd or (recently) free'd
| * | | | | | | Fix trivial QList detaching: QListData::detach2() *must* memcpy.Thiago Macieira2009-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.5 did that and the node_copy function depended on it. I have some patches from Lars that introduce detach3() and try to improve performance a bit more.
| * | | | | | | QMetaObject: Crashes with dbus that tries to connect to all signalsOlivier Goffart2009-08-211-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compatibility method QMetaObject::connect did not handle the signal_index = -1 to connect to all signal Reviewed-by: Thiago
| * | | | | | | Fix crash at program exit: Q_GLOBAL_STATIC is zeroed.Thiago Macieira2009-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When libraryData() is 0, &libraryData()->map is 0x4. So make sure we return 0 if libraryData() is null too. Reviewed-by: TrustMe
| * | | | | | | Added missing Q_ENUM/Q_FLAGS declarations for input methods.Friedemann Kleint2009-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis <qt-info@nokia.com>
| * | | | | | | QFSFileEngine compile fix for VS2005Joerg Bornemann2009-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last change wasn't enough...
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-211-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | QFSFileEngine compile fix for Windows with VS2005Joerg Bornemann2009-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | | | Merge branch 'master' of git@scm:qt/qt-s60-publicaxis2009-08-21123-990/+7665
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / This brings support for the S60 platform into Qt.
| | * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-211-0/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
| | * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-215-86/+211
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_unix.cpp src/corelib/plugin/qlibrary.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp
| | * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-2110-127/+497
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess.h
| | * | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-218-26/+66
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'reviewPatches'axis2009-08-215-50/+15
| | |\ \ \ \ \ \ \ \
generated by cgit v0.12 at 2025-01-10 22:25:18 (GMT)