summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Fixed compilation on windows.Dmytro Poplavskiy2009-11-031-3/+3
| | | | Reviewed-by: trustme
* Fixed qrand global static related problem.Dmytro Poplavskiy2009-11-031-19/+40
| | | | | | | | | | | qrand() uses global static seed storage, but if used from destructors of other global static objects (directly or via ~QSettings() or QMap::insert()) the global static seed storage can be already deleted. Fallback to plain rand() in this case. Task-number: QTBUG-5218 Reviewed-by: Justin McPherson
* Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6Thiago Macieira2009-11-0213-106/+306
|\
| * Merge remote branch 'origin/4.6' into core-4.6Thiago Macieira2009-10-2912-106/+808
| |\
| * | Remove the posix_memalign and Win32 _aligned_mallocThiago Macieira2009-10-291-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MinGW doesn't have _aligned_malloc and posix_memalign doesn't have a realloc function. So use our own implementation in all platforms. Removing posix_memalign was reviewed by Brad, but I apparently lost the commit. Reviewed-by: Trust Me
| * | Merge branch '4.6' into core-4.6Thiago Macieira2009-10-292-8/+17
| |\ \
| * | | Fix compilation on Mac: there's no malloc.h thereThiago Macieira2009-10-291-5/+4
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Update confusing qWarning message.Thiago Macieira2009-10-291-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| * | | Fix compilation in QContiguousCache.Thiago Macieira2009-10-291-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Initialise the reserved bits to 0.Thiago Macieira2009-10-287-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is future compatibility: we must rely on them being 0 in older versions of Qt. Reviewed-by: Bradley T. Hughes
| * | | Fix Qt containers to properly support types with strict alignments.Thiago Macieira2009-10-289-39/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QContiguousCache is a new type, so there are no binary compatibility issues. QHash and QMap didn't have any public qMalloc / qFree, so the entire logic is contained in .cpp code. However, since old code will not inform us of the alignment requirements, we need to add a bit to the structure to indicate whether strict alignment is in use or not. QList doesn't require any changes. For small, movable types, they're all stored in the pointer array itself, so they're aligned. For larger types, we use new(), so types with stricter requirements should define their own operator new(). QLinkedList cannot be fixed. It uses new() on the QLinkedListNode, which contains a T type. Sorry. QVector did have public qMalloc / qFree. I've moved the calls to the inner function and made it keep the old calls if the alignment requirement is below a certain threshold. The idea is that, if it's above, no one was using QVector anyway. Reviewed-by: Bradley T. Hughes
| * | | Add the aligned versions of qMalloc/qRealloc/qFreeThiago Macieira2009-10-282-0/+103
| | | |
| * | | Add some STL compatibility for QContiguousCache and private inheritanceThiago Macieira2009-10-281-60/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The private inheritance ensures that we don't try to access the types under the wrong pointer. If we did that, we'd cause strict aliasing violations. Reviewed-by: Olivier Goffart
| * | | Merge remote branch 'origin/4.6' into core-4.6Thiago Macieira2009-10-282-3/+6
| |\ \ \
| * | | | Make QProcess report errors from a failed subprocess start.Thiago Macieira2009-10-271-4/+14
| | | | | | | | | | | | | | | | | | | | Reviewed-by: João Abecasis
| * | | | QLibrary on Windows: Do not show error boxes when library load failsPeter Hartmann2009-10-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading a library fails, the error message "The application or DLL ... is not a valid Windows image. Please check this against your installation diskette." is shown, which is not very helpful. Task-number: QT-2357 Reviewed-by: Marius Storm-Olsen
* | | | | Merge commit 'origin/4.6' into featureJørgen Lind2009-11-0219-220/+423
|\ \ \ \ \
| * | | | | 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
* | | | | | | Reverts bf1a6bb6b3b8c98f6ab402512eb2f1996c2435c7Jørgen Lind2009-10-307-119/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and removes THREAD from qfeature Reviewed-by: Trust Me
* | | | | | | Remove QT_NO_ICON from mimimalJørgen Lind2009-10-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | Fix SHAREDMEMORYJørgen Lind2009-10-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
* | | | | | | Fix PROXYMODELJørgen Lind2009-10-293-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me