summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-145-5/+20
|\
| * Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-147-23/+39
| |\
| * | Check if the timeout expired during the time update in qt_safe_selectThiago Macieira2009-12-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can happen that select(2) returns -1 with EINTR, but the time remaining was too small for us to update the time. Our own processing (plus the syscall to clock_gettime(2)) leads us past the timeout, so we get a negative timeval. Task-number: QTBUG-6755 Reviewed-by: Bradley T. Hughes
| * | Document QTextEncoder::fromUnicode as QT3 support memberAnders Ahlen2009-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make deprecated QTextEncoder::fromUnicode ( const QString & uc, int & lenInOut ) documented as QT3 support member Task-number: QTBUG-6614 Merge-request: 399 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Ensure that QProcessEnvironment::operator== doesn't crashThiago Macieira2009-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | Also add an extensive autotest suite for QProcessEnvironment Task-number: QTBUG-6701 Reviewed-by: Markus Goetz
| * | Use realpath() only on systems we know it works on.Denis Dzyubenko2009-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use realpath(X,0) extension that is defined by the latest POSIX standard and not many systems support it at the moment. For now we limit it to Linux and Symbian. Mac supports it starting with 10.6, and we'll implement it properly for Mac in 4.7. We know that neither *BSD systems nor Solaris do not support it. Reviewed-by: Markus Goetz
| * | Merge commit 'origin/4.6' into 4.6-upstreamBradley T. Hughes2009-12-091-0/+13
| |\ \
| | * | Compile on Windows CE.Bradley T. Hughes2009-12-081-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows CE does not support Windows hook at all, so we need to call our hook function "manually" from process events. Task-number: QTBUG-6083 Reviewed-by: joerg
* | | | Fix QMetaObject::connect and disconnect with "dynamic signals"Olivier Goffart2009-12-142-20/+24
| |_|/ |/| | | | | | | | | | | | | | | | | | | | QML might pass index that are larger that the method cound. We must not call QMetaObjectPrivate::originalClone in that case as this would read invalid memory Reviewed-by: brad
* | | Fix warning in public headerOlivier Goffart2009-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | qcache.h:73: warning: declaration of 'object' shadows a member of this Spotted by compilerwarnings autotest Reviewed-by: Thiago
* | | Fixed invalid read in QCache::unlink after recent change.Samuel Rødal2009-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | We need to store a pointer to the object in order to delete it later, since the node containing the pointer will be deleted when removing it from the hash. Reviewed-by: Jan-Arve Sæther
* | | Prevented leak of keys in QPixmapCache.Samuel Rødal2009-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing a pixmap from the pixmap cache using the new QPixmapCache::Key API left the keys dangling in the QCache's internal QHash. The problem is that the Key is invalidated as soon as the QPixmapCacheEntry is destroyed, thus removing it from the hash failed. Reordering the destruction of the object and the removal of the key in QHash fixes the problem. Reviewed-by: Alexis Reviewed-by: Thiago
* | | Doc: Try to explain better when and how the easing curve is appliedJan-Arve Sæther2009-12-101-0/+7
| | | | | | | | | | | | | | | | | | | | | Maybe not perfect, but it should be *better* at least. Task-number: QTBUG-6623 Reviewed-by: Thierry
* | | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
| | | | | | | | | | | | | | | | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
* | | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-12-093-6/+6
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-092-13/+5
| |\ \
| * | | Fixed (unstable) tst_QTimeLine::currentTime test failureRohan McGovern2009-12-091-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Use qFuzzyCompare instead of an exact floating point comparison when checking if valueChanged should be emitted. Task-number: QTBUG-6189 Reviewed-by: Dmytro Poplavskiy
| * | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-052-5/+5
| |\ \ | | | | | | | | | | | | oslo-staging-1/4.6 into 4.6
| | * | Fix Run-Time Check Failure with MSVC when downcasting.Thiago Macieira2009-12-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you cast from a 64-bit type to a 32-bit one, MSVC produces an RTCF, despite the explicit cast. The solution is to add & 0xFFFFFFFF. Task-number: QTBUG-4255 Reviewed-by: Marius Storm-Olsen
| | * | Don't look at the patch-level number when loading plugins.Thiago Macieira2009-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt claims that it maintains forwards and backwards binary compatibility within the same Qt minor series. So it should be safe to load a plugin built with Qt 4.6.2 on Qt 4.6.1. Reviewed-by: Bradley T. Hughes
* | | | Use 64bit for the connectedSignalsOlivier Goffart2009-12-092-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as QML objects may have lots of signals Do not use quint64 as it would produce lots of useless padding on MSVC 32bit Reviewed-by: Brad
* | | | Fix regression in qVariantFromValue when converting from complex type to ↵Olivier Goffart2009-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple type QVariant v = QColor(Qt::red); v.setValue(1000); Would produce a variant with garbage. the destructor of QColor would not be called, and the 1000 would be in the QVariant::PrivateShared, while most of the QVariant code assume that numbers are dirrectly in the QVariant::Data union Task-number: QTBUG-6602 Reviewed-by: Thierry
* | | | Implement qsrand() for Symbian OSShane Kearns2009-12-081-13/+18
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | After checking the source code of OpenC stdlib, rand and srand are thread safe (they use Symbian's TLS internally) so the Symbian implementation mostly follows the Windows one (where this is also true) Task-number: QTBUG-6372 Reviewed-by: Janne Koskinen
* | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-048-51/+85
|\ \ \ | |/ /
| * | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-041-0/+57
| |\ \
| * \ \ Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-039-54/+90
| |\ \ \ | | | |/ | | |/|
| | * | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-022-4/+6
| | |\ \
| | * | | Fix regression in tst_QFileSystemWatcherBradley T. Hughes2009-12-011-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dnotify doesn't work on dup'ed file descriptors apparently, so we need to closedir() before using fcntl() to set the watches. Reviewed-by: TrustMe
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-12-011-3/+4
| | |\ \ \
| | | * | | Re-enabled realpath() on symbian.Denis Dzyubenko2009-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was disabled by accident when we were disabling it for Mac. Reviewed-by: Prasanth
| | | * | | Fix a crash in QFSFileEnginePrivate::canonicalized() on Mac OS X 10.5Prasanth Ullattil2009-12-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The realpath() extension we use in this function is only available from 10.6 onwards. For the time being this optimization is turned off on Mac. Reviewed-by: Markus Goetz
| | * | | | Make sure file descriptors are valid in the dnotify implementation of ↵Bradley T. Hughes2009-12-011-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFileSystemWatcher Commit 71c3227ba260b964b0c9516f05ad4f2e6fa72f69 fixed a memory leak by calling closedir(), which would also close the file descriptor we were wanting to watch. Fix this by duplicating the file descriptor that we store. Reviewed-by: TrustMe
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-11-302-13/+25
| | |\ \ \
| | | * | | Fixes a crash on Mac with QFileInfo.Denis Dzyubenko2009-11-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | realpath() crashes on mac if the input file path is the root ("/") - on 10.6 calling a free on the returned value shows a warning saying the memory was not allocated. To workaround that just added a special case - if the input string is '/', we don't need to use realpath as we already know that the path is canonical. Reviewed-by: Prasanth
| | | * | | Unix: Avoid stat() when opening a fileMarkus Goetz2009-11-301-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The open() syscall can open directories for reading, which we in QFile and file engines don't support. However, there is no need for stat() to find out if it is a directory if we open() with a write flag because then the syscall will fail anyway. Reviewed-by: joao
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-11-304-45/+34
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-294-45/+34
| | | |\ \ \
| | * | \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-11-271-0/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix memory leak in the DNotify implementation of QFileSystemWatcherBradley T. Hughes2009-11-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that all calls to opendir() are paired with a call closedir(). Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-4840
| | * | | | | Fix performance regression of posted eventsBradley T. Hughes2009-11-272-29/+40
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 31f1ff91028dd7f90925d5b3737e4d88b5fb07aa introduced a performance regression by using SetTimer() to delay the next call to sendPostedEvents(). SetTimer() has a minimum resolution, around 15-16ms, which is too slow for most uses. Fast timers and QWidget::update() use posted events to do their job, and suffered as a result. This commit goes away from using SetTimer() to using a GetMessage() hook that examines the input queue as soon as message are pulled from the queue. Now there is no large delay between calls to sendPostedEvents(), they are sent as quickly as possible (once all other input and timer messages have been delivered). Reviewed-by: Prasanth Ullattil Task-number: QTBUG-6083
| | * | | | Improve QFileInfo benchmarkMarkus Goetz2009-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | Avoid using return value from a temporary objectMarius Storm-Olsen2009-11-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The temporary object goes away before the next line is executed, so the pointer to the const data is invalid. Just put it all on one line, and we're ok. Reviewed-by: Brad
| | * | | | Checks for len = 0 in QIconvCodec::convertFromUnicodeNils Christian Roscher-Nielsen2009-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iconv hangs when len is initially 0 on some Solaris platforms. This can be seen in the standarddialogs example when calling QFileDialog::getOpenFileName() for instance. Reviewed-by: ddenis Task-number: QTBUG-4976
| | * | | | Optimize QFSFileEnginePrivate::canonicalized() by using realpath()Markus Goetz2009-11-251-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In our benchmark, this makes QFileInfo.canonical*Path() up to 50% faster. This should also improve application startup time. Let's see if it works on all Unices and Symbian. Reviewed-by: mariusSO
| * | | | | QVector: fix const_iterator-=(int)hjk2009-11-301-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Reviewed-by: Harald Fernengel
* | | | | Made qobject.h "syncqt compliant".Jan-Arve Sæther2009-12-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous patch to this file made syncqt confused (maybe because of the brackets), and caused it to not generate the QObject header file. This made of course a lot of stuff not compile. With this patch syncqt behaves. Reviewed-by: Olivier Goffart
* | | | | Merge branch 'win32-icc' into 4.6Jan-Arve Sæther2009-12-042-12/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Make sure that QtGui links with QtCore for the win32-icc mkspec.Jan-Arve Sæther2009-12-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix it by exporting QObjectData. Since this is a compiler bug we will only export it for the compiler that has this problem. (Intel Compiler on Windows) The Intel compiler seems to inline the destructor of QObject (or at least parts of it) even if it is declared virtual. Thus, it seems that the destruction of the QScopedPointer<QObjectData> member is inlined into QtGui, and that code will eventually call the destructor of QObjectData, and since QObjectData was not exported from QtCore it would crash. Reviewed-by: Olivier Goffart
| * | | | Revert "Compile fix for win32-icc."Jan-Arve Sæther2009-11-301-12/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit db5e4496229a776768464d1d3d2e1f8e81bd6ba0.
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-031-0/+57
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | 4.6-staging2
generated by cgit v0.12 at 2025-01-15 07:14:39 (GMT)