summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-2221-1304/+178
|\ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/kernel/kernel.pri src/corelib/tools/tools.pri tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h
| * Merge commit 'origin/4.5'Samuel Rødal2009-05-201-4/+1
| |\
| | * Fix a compile error on MSVC 64bits due to qhash casting a pointer.Thierry Bastian2009-05-201-4/+1
| | | | | | | | | | | | | | | | | | | | | I tested it with 32 bits compilation and there is no warning any more. Task-number: 247325 Reviewed-by: ogoffart
| * | Remove QDumper. It was used in a previous version of creator but is nowThierry Bastian2009-05-202-1158/+0
| | | | | | | | | | | | useless.
| * | allow to debug QVariant of float typeThierry Bastian2009-05-201-1/+4
| | | | | | | | | | | | Reviewed-by: ogoffart
| * | Use a per object lock for signal/slotsOlivier Goffart2009-05-201-22/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way we prevent the current possible race condition that may appears while touching signals slot while object are moved to different threads. For exemple, when we do sender->threadData->mutex->lock(); the sender can possibly be moved to another thread between the moment we get the pointer to the threadData and the moment we aquire the lock. We could check if we locked the right mutex and retry otherwise, but that would break if the threadData (and hence the mutex) get destroyed in between. The per object mutex is implemented with a thread pool. I'm not using the global QThreadPool because we might ends up locking two of their mutex, and that would be dangerous if something else holds a lock on the same mutex (possible deadlock) Putting the mutex pool in a Q_GLOBAL_STATIC doesn't work as it might result of the ppol being deleted before some other object in others Q_GLOBAL_STATIC structures There is no need to lock this mutex in moveToThread as this is safe. When emiting a signal, we do not need to lock the thread data, as the user must ensure that the object is not moved to a thread while emiting a AutoConnection signal. Reviewed-by: Brad
| * | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-201-3/+4
| |\ \ | | |/
| | * Optimize QIoDevice::readAll() to possibly do less (re)allocationsMarkus Goetz2009-05-201-3/+4
| | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart Reviewed-by: Peter Hartmann Reviewed-by: João Abecasis
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-1912-20/+33
| |\ \ | | |/
| | * Fix stopping link loops in QDirIterator on WindowsEskil Abrahamsen Blomfeldt2009-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currentFileInfo is only used for returning from the public functions since the file info used in the algorithm is one step ahead. nextFileInfo is the one actually used in the algorithm. The bug was introduced in a compile fix for Windows and broke the stopLinkLoop test for QDirIterator. Reviewed-by: Olivier
| | * Clarifying what QLocale::C is and is notNils Christian Roscher-Nielsen2009-05-191-2/+2
| | | | | | | | | | | | Reviewed-by: David Boddie
| | * Clearifying QUrl docsMorten Engvoldsen2009-05-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Adding more details on QUrl::addQueryItem() Task-number: 234125 Rev-by: Thiago Macieira
| | * Fix compiler warning: use C++ cast operator, not the old-style C cast.Ariya Hidayat2009-05-191-1/+1
| | | | | | | | | | | | Reviewed-by: Marius Storm-Olsen
| | * Added doc about QSharedMemory and other applicationsMarkus Goetz2009-05-181-0/+4
| | | | | | | | | | | | | | | Task-number: 253835 Reviewed-by: David Boddie
| | * Replace all occurences of "heirarchy" with "hierarchy"Andre Haupt2009-05-181-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Andre Haupt <andre@bitwigglers.org> Reviewed-By: Thiago Macieira
| | * Fix handling of dynamic casts in QSharedPointer.Thiago Macieira2009-05-181-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's wrong to assume that static_cast<> is allowed everywhere where dynamic_cast<> is allowed. For example, if class C derives from both A and B, then you can dynamic_cast<B *>(ptr_to_A), but you can't static_cast. So introduce a helper for dynamic casts that doesn't do static_cast. Reviewed-by: Olivier Goffart
| | * Fix some typos in the documentation.Frederik Schwarzer2009-05-185-5/+5
| | | | | | | | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
| * | Merged branch 'master' of git://gitorious.org/~dfaure/qt/dfaures-clone.gitSimon Hausmann2009-05-181-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | David Faure (1): Fix compilation with strict iterators Merge-request: http://qt.gitorious.org/qt/qt/merge_requests/437 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | Fix compilation with strict iteratorsDavid Faure2009-05-181-1/+1
| | | |
| * | | Add src/corelib/kernel/qpointer.cpp to src/corelib/kernel/kernel.priBradley T. Hughes2009-05-181-1/+2
| | | | | | | | | | | | | | | | Makes it possible to find it when using QtCreator :)
| * | | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-4/+9
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| | * | Fix race condition in ~QObjectOlivier Goffart2009-05-182-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while using QOrderedMutexLocker::relock we might unlock our mutex protecting the 'senders' list for a short moment. Another thread may then modify or remove element on the list. Therefore, we need to recheck the consistency of the list once we did that. Also, we cannot call removeSender because that will remove every connections, making impossible for another object destroyed in the same time to clean up the senders list, so call derefSender instead. Reviewed-by: Brad
| * | | Make QVectorTypedData inheriting from QVectorDataOlivier Goffart2009-05-181-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This way the content of QVectorData is not duplicated in the code. Reviewed-by: Thiago Reviewed-by: Brad
| * | | Fix warning on QVector with gcc4.4Olivier Goffart2009-05-181-77/+77
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QVectorData whenever possible instead of QVectorTypedData. It is not safe to convert the shared_null to QVectorTypedData as different instance of qvector with different type may cast it in the same function (because everything is inline) and that would break strict aliasing. Reviewed-by: Thiago Reviewed-by: Brad
* | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-05-1826-395/+388
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qvariantanimation.cpp src/gui/graphicsview/qgraphicsitem.cpp
| * | | Avoid resetting the QVariantAnimation::currentValue when changing stateLeonardo Sobral Cunha2009-05-151-2/+0
| | | | | | | | | | | | | | | | Reviewed-by: janarve
| * | | General refactors in QVariantAnimationLeonardo Sobral Cunha2009-05-152-27/+35
| | | | | | | | | | | | | | | | Reviewed-by: janarve
| * | | Update current value on QVariantAnimation::setKeyValuesLeonardo Sobral Cunha2009-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current value was udpated on setKeyValueAt, but not on setKeyValues and this was leading to a semantic inconsistency. Reviewed-by: janarve
| * | | Avoid interpolating if we have less than 2 key values in QVariantAnimationLeonardo Sobral Cunha2009-05-151-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have less than 2 key values, we should neither try to interpolate nor set the current value. Reviewed-by: janarve
| * | | Indentation and whitespace fixes in animation apiLeonardo Sobral Cunha2009-05-155-13/+10
| | | |
| * | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-141-1/+1
| |\ \ \
| | * \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-1318-290/+115
| | |\ \ \ | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | * | | correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero.
| | * | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-1252-720/+1100
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | * \ \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-04-296-131/+171
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | * | | | | | Merged local changes.David Boddie2009-04-291-1/+1
| | | | | | | |
| * | | | | | | Make QAbstractTransition::eventTest() non-constEskil Abrahamsen Blomfeldt2009-05-149-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We decided to remove the const of the eventTest() since some transitions have dynamic conditions and need to update when eventTest() is called.
| * | | | | | | correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero.
| * | | | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-131-55/+85
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Geir Vattekar2009-05-133-15/+23
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | into kinetic-animations
| | * | | | | | Doc: Work on QStateMachine class descriptionGeir Vattekar2009-05-131-55/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen
| | * | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-05-1225-438/+451
| | |\ \ \ \ \ \
| * | | | | | | | kill the QT_STATEMACHINE_SOLUTION defineKent Hansen2009-05-1318-228/+16
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | We won't release another Qt Solution, so the define is no longer needed.
| * | | | | | | correctly handle multiple signal transitions for same (object,signal)Kent Hansen2009-05-123-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal was not disconnected at the right time. We now store the number of active signal transitions for a particular (object,signal) and only disconnect when the count drops to zero.
| * | | | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Alexis Menard2009-05-1254-2748/+1524
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | | | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-123-7/+65
| | |\ \ \ \ \ \
| | | * | | | | | Doc: Work on QPauseAnimationGeir Vattekar2009-05-111-0/+16
| | | | | | | | |
| | | * | | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Geir Vattekar2009-05-115-12/+74
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | * | | | | | | Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroupGeir Vattekar2009-05-112-7/+49
| | | | | | | | | |
| | * | | | | | | | Fixes crash when calling QState::setErrorState() with null pointerEskil Abrahamsen Blomfeldt2009-05-121-1/+1
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | When the state is null, it isn't the root state.
generated by cgit v0.12 at 2025-01-11 22:47:26 (GMT)