summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Add missing QENUM declarations (needed by declarative).Warwick Allison2009-11-021-0/+2
|
* Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-305-102/+287
|\
| * QLocale: AM/PM symbol support for symbian platformdka2009-10-281-1/+3
| | | | | | | | Reviewed-by: Denis Dzyubenko
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into ↵Bradley T. Hughes2009-10-282-5/+184
| |\ | | | | | | | | | 4.6-WM_NULL-driven
| | * Fill gap of X.org/XFree multimedia/special/launcher keysHelio Chissini de Castro2009-10-272-5/+184
| | | | | | | | | | | | | | | | | | | | | Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X Merge-request: 1742 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * Merge branch '4.6' into 4.6-platformDenis Dzyubenko2009-10-265-28/+46
| | |\
| * | \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-drivenBradley T. Hughes2009-10-287-31/+52
| |\ \ \
| * | | | Don't stop event processing at the second WM_QT_SENDPOSTEDEVENTSBradley T. Hughes2009-10-281-3/+7
| | |/ / | |/| | | | | | | | | | | | | | We should continue processing as much as we can, and report the WM_QT_SENDPOSTEDEVENTS at the end of processEvents().
| * | | Compile on Windows when QS_RAWINPUT is not defined.Bradley T. Hughes2009-10-211-1/+4
| | | |
| * | | Use GetStatusQueue() to look for timer and input messagesBradley T. Hughes2009-10-211-2/+1
| | | | | | | | | | | | | | | | | | | | This function works more reliably than PeekMessage() with different flags.
| * | | Remove workarounds for Win32 event dispatcher bugsBradley T. Hughes2009-10-201-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes the startstop timer delay in QAbstractAnimation, and the inSizeMove workaround for paint events. Reviewed-by: Prasanth Ullattil
| * | | Send posted events in response to WM_QT_SENDPOSTEDEVENTSBradley T. Hughes2009-10-201-84/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (which is just WM_USER+1) Delay the next WM_QT_SENDPOSTEDEVENTS iff there is a WM_TIMER or input event pending We also need to break out of processEvents() after seeing this message, to prevent livelocking in the prescence of fast timers. I also took the liberty of defining WM_QT_SOCKETNOTIFIER (WM_USER) at the same time (to give clear meaning to what WM_USER and WM_USER+1 are used for). Reviewed-by: Prasanth Ullattil
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into origin-4.6Olivier Goffart2009-10-302-15/+19
|\ \ \ \
| * \ \ \ Merge branch '4.6-s60' into 4.6axis2009-10-302-15/+19
| |\ \ \ \
| | * | | | Fixed: Variable res goes out of scope but is accessed later via pointerMiikka Heikkinen2009-10-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In qdatetime UTC conversion functions, variable res was declared in incorrect scope and went out of scope too soon in Symbian. Reviewed-by: Janne Koskinen
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-292-8/+17
| | |\ \ \ \
| | * | | | | Increased block size for file IO in Symbian.Miikka Heikkinen2009-10-281-12/+16
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each read requires costly IPC call to Symbian file server, so reading and writing large files has lot of unnecessary overhead when using 4k block size. Increased the block size to 16k, which is what QIODevice will request at maximum. This speeds up reading large files up to 10%. Also included are some unnecessary whitespace removals. Task-number: QT-2347 Reviewed-by: axis
* | | | | | Merge commit 'widget/4.6' into origin/4.6Olivier Goffart2009-10-306-78/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Conflicts: src/gui/effects/qgraphicseffect.cpp
| * | | | | Fix qvariant_cast<QVariant> when a QVariant is really inside a QVariantOlivier Goffart2009-10-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix the QPropertyAnimation test. Reviewed-by: Gabriel Reviewed-by: Thierry
| * | | | | Merge commit origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-294-11/+23
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fix warning in qvariant.h header + make sure QVariant in QVariant works as ↵Olivier Goffart2009-10-281-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected Also add more test Reviewed-by: Thierry
| * | | | | Use qLowerBound in qBinaryFindPascal Létourneau2009-10-281-32/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of qBinaryFind use 64bit arithmetics even on a 32bit system, which make it slow The docs mention qBinaryFind will find any occurence of the search value not necessarily the first one, but this is not case with current implementation So nothing prevents the use of qLowerBound Reviewed-by: Olivier Goffart Merge-request: 1513
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-281-7/+0
| |\ \ \ \ \
| | * | | | | Let QGraphicsItem set QObjectPrivate::wasDeleted when appropriate.Andreas Aardal Hanssen2009-10-281-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows children of QGraphicsObject-derived classes to check if the parent is being deleted by checking the private flag wasDeleted. Reverts 37b16d5cbb4e7bc534f690ebf50434d228b5ecfc, p4 change 9681, to allow QGraphicsItem to set QObjectPrivate's wasDeleted member before entering QObjectPrivate's destructor. The original code was in there to let the user know, via the console output, that QObject was double-deleted (e.g., when placing QObject on the stack, and also giving it a parent, so that if the parent is deleted first, bang). Reviewed-by: Aaron Kennedy Reviewed-by: Bradley T. Hughes
| * | | | | | Merge branch 'fixes' of ↵Jan-Arve Sæther2009-10-283-7/+25
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into openbossa-fleury-fixes3 Conflicts: src/gui/graphicsview/qgraphicsanchorlayout_p.cpp src/gui/graphicsview/qgraphicsanchorlayout_p.h
| * | | | | Fix incomplete documentation for Qt::DecorationRoleDavid Faure2009-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noticed by Laurent Montel. Merge-request: 1812 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | | | | QVariant::isNull does not return the right result with QVariant::setValueOlivier Goffart2009-10-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by merge request 1911 Reveiwed-by: Thierry
| * | | | | MAke sure we call setCurrentTime when an animation is startedThierry Bastian2009-10-232-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could be prevented by a pause animation currently running. Reviewed-by: Leo
* | | | | | Introduce internal StateType to avoid excessive qobject_castsKent Hansen2009-10-307-25/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The state machine algorithm frequently needs to know what type a state is, e.g. if it is atomic, final or a history state. We were using qobject_cast() to determine this, but that function is expensive. This commit introduces an internal StateType to be able to differentiate between the different types of state. This vastly improves performance. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | | | | | Compile fix until configure.exe is rebuilt for WindowsThiago Macieira2009-10-291-1/+2
| | | | | |
* | | | | | Import a new implementation of fromUserInput.Thiago Macieira2009-10-291-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported from http://github.com/icefox/guessurlfromstring Licensed under the 3-clause BSD license by the copyright holder.
* | | | | | Remove the fromUserInput implementation and tests.Thiago Macieira2009-10-291-73/+46
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Add the Qt Evaluation message to the hidden libQtCore.so boilerplate.Thiago Macieira2009-10-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust Me
* | | | | | Part 2 of the Evaluation notice feature, now for QtGui.Thiago Macieira2009-10-292-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Daniel Molkentin
* | | | | | Readd the Qt Evaluation timebomb, step 1.Thiago Macieira2009-10-295-1/+585
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the QtCore part of the timebomb. Reviewed-by: Daniel Molkentin
* | | | | | Cache a state's parent stateKent Hansen2009-10-292-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractState::parentState() is called heavily by the state machine algorithm. The parent state is obtained by qobject_cast'ing QObject::parent(). qobject_cast() is expensive. This commit introduces caching of the result in order to improve performance. We expect that the cache won't be invalidated much since the parent-child relationship of states usually doesn't change after the state machine is started. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | | | | | doc: Remove \internal tag from QStateMachine::configuration()Kent Hansen2009-10-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is useful for debugging, if nothing else, and has been requested by users. We also refer to it in one of our blog posts, so there's little point in trying to hide it any longer. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | | | | | Make QStateMachine event posting functions thread-safeKent Hansen2009-10-292-17/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By popular demand on the Qt Labs blog. This makes it possible to readily use QStateMachine with e.g. worker threads that post events to the machine. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | | | | | Cache QState's child statesKent Hansen2009-10-292-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the same type of optimization as that done for transitions in commit 5d8dcd57cd13fdd9c8643fa3bdda9f197a4351ff. The idea is to avoid calling qobject_cast() because it's very expensive. Obtaining child states needs to be as fast as possible because it's in the critical path of the state machine algorithm; it's called by a ton of internal functions, like isCompound(), isAtomic(), isInFinalState(). It's also called heavily for parallel state groups. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | | | | | QStateMachine::event() should call QState::event()Kent Hansen2009-10-291-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Since QStateMachine inherits QState now. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | | | | Greatly improve the performance of obtaining a state's transitionsKent Hansen2009-10-282-8/+17
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transitions are children of their source state. We use QObject::children() and qobject_cast() each child to a QAbstractTransition to see if it is indeed a transition. However, calling qobject_cast() is very expensive. This commit introduces a cached list of transitions. The list is invalidated after a child object has been added or removed. In the typical case we expect the object hierarchy to remain fairly constant once the state machine has been started (states, child states and transitions are usually "static"), in other words the cached list is not likely to be invalidated much. Obtaining a state's transitions needs to be as fast as possible because it's in the critical path of the state machine algorithm. Reviewed-by: Eskil Abrahamsen Blomfeldt
* | | | Fix integer overflow in string.remove len parameterMarkus Goetz2009-10-271-3/+3
| | | | | | | | | | | | | | | | | | | | Task: 262677 Reviewed-by: joao
* | | | Doc: Fixed qdoc warnings.David Boddie2009-10-261-0/+3
| |/ / |/| | | | | | | | Reviewed-by: Trust Me
* | | Fix bad check for GCC version.Thiago Macieira2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | These macros are available since GCC 2.95. Reviewed-by: Olivier Goffart
* | | Improved gesture event filtering inside QGraphicsView for QGraphicObjectsDenis Dzyubenko2009-10-221-1/+4
| | | | | | | | | | | | Reviewed-by: trustme
* | | Changed qsrand() behavior for Windows to match the linux versionninerider2009-10-221-5/+20
|/ / | | | | | | | | | | | | | | A problem occurred related to the createUUid function on Windows Mobile. Calling rand() before srand() resulted in identical pseudo random sequences for different threads. Reviewed-by: Joerg
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Marius Bugge Monsen2009-10-211-2/+3
|\ \ | |/
| * Doc update for QDir::rootPath and QDir::homePath in Symbian.Janne Anttila2009-10-201-2/+3
| | | | | | | | | | Task-number: QTBUG-4867 Reviewed-by: Aleksandar Sasha Babic
* | Fixes to the way animations are registered to the timerThierry Bastian2009-10-211-12/+9
| | | | | | | | | | | | | | It could happen that an animation would be unregistered when it shouldn't. Reviewed-by: Leo Cunha
* | Improve performance when starting a lot of animationsThierry Bastian2009-10-211-2/+3
| | | | | | | | | | | | | | We avoid stopping/starting the timer over and over again Patch suggested by Aaron. Reviewed-by: Aaron Kennedy