summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-11-134-15/+17
|\
| * remove dependency on git line end conversionsOswald Buddenhagen2009-11-124-15/+17
| | | | | | | | consistently use QIODevice::Text
* | Disable optimisations which break stack traces on MaemoTom Cooksey2009-11-131-2/+2
| | | | | | | | | | | | | | | | | | The -O2 mode enables omit-frame-pointer & optimize-sibling-calls, which can break stack traces. So, even in release mode, disable these optimisations so that we can at least still get a backtrace when a Qt application dies. Reviewed-By: Stefano Pironato
* | Generate debug symbols in release mode on MaemoTom Cooksey2009-11-131-0/+4
| | | | | | | | Reviewed-By: Stefano Pironato
* | Add mkspec for Maemo 5 & 6Tom Cooksey2009-11-132-0/+70
| | | | | | | | | | Reviewed-By: Robert Griebl Reviewed-By: Thiago Macieira
* | Merge branch 'necessaryBCPatches' into 4.6axis2009-11-1310-119/+876
|\ \
| * | Fix corelib def files for the new atomics implementationShane Kearns2009-11-132-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6.0 has the wrong atomics implementation for symbian, as the team branch was not merged before the freeze. This updates the def files to match the implementation on the team branch so that it can be cherry-picked. Task-number: QTBUG-5752 Reviewed-by: Iain
| * | Fix functions that return whether atomics are natives following review commentsShane Kearns2009-11-132-18/+76
| | | | | | | | | | | | Reviewed-By: Brad
| * | Binary compatibility of Symbian ARMv5 and ARMv6 buildsShane Kearns2009-11-139-39/+587
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ARMv6 atomics where available Use OS atomics otherwise Integrate ARMV6 atomics to Symbian builds Use compiler defined macros to detect if ARMv6 instructions are available This defines the QT_HAVE_ARMV6 macro, replacing the way it was defined by the Symbian build system previously in qpainting.pri. qatomic_symbian now uses qatomic_arm or qatomic_armv6 automatically Port armv6 atomics to implement generic atomics interface The inline atomics are not inlined when we build for thumb using RVCT. So there is no performance improvement of using the "inline" versions vs a shared version called through a function call. The generic atomics interface is good for binary compatibility, as the same symbols are exported in all versions now. Changed the fallback generic atomics implementation from the unix one to a symbian specific one using RFastLock (identical code to the windows generic atomics, except for RFastLock replaces Win32 CRITICAL_SECTION) Note: GCCE atomics still need porting Tell git to ignore .lst listing files (produced by sbs/abld listing) ARMv6 support for GCCE compiler and fallback implementation using OS When building corelib with GCCE and -march=armv6, QT_HAVE_ARMV6 will be defined. This patch adds copies of the asm functions in GCC syntax. When building for the Symbian emulator, or ARMv5, then Symbian OS atomic functions are used as a fallback - these are more efficient than the unix atomics, and don't require data import (which the ARMv5 atomics use, but the OS loader doesn't support fully) Symbian OS functions are always used for QBasicAtomicInt::ref / deref, because these are faster than the generic function in all cases. They are machine coded for ARMv6, and are used internally by RFastLock. Reviewed-By: axis Reviewed-By: Brad
| * | Add the ARMv6 inline assembly code for compiling with RVCT.Thiago Macieira2009-11-131-0/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically a copy & paste of the GCC inline assembly above, switched to the RVCT inline assembly model (which is actually easier to write and understand). I verified that this code compiles and assembles as expected. The output generated by RVCT is pretty much on the mark. However, I have not executed this code yet to see if it performs as expected. To be noted: - when expanding the inline template code, RVCT may be tempted to switch your entire function to ARM mode. Should we add __attribute__((noinline)) to prevent that? - There's no equivalent to GCC inline assembler's clobber, especially of "memory". Also, there's no "volatile" qualifier to the assembly. Does the compiler know it can't reorder the code? Does it know it shouldn't trust the value of the memory after this? My test indicates the code is fine... Reviewed-By: Shane Kearns
| * | Reorganize the qatomic_armv6.h file to receive the RVCT inlineThiago Macieira2009-11-131-81/+90
|/ / | | | | | | | | | | | | | | | | assembly. Move the *Relaxed, *Acquire and *Release functions (which are simply forwarding calls to the *Ordered version) to the bottom of the file. Reviewed-By: Shane Kearns
* | Add an entry to the changelog about the XUnit support in QtTestThiago Macieira2009-11-131-1/+4
| |
* | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1350-291/+519
|\ \
| * | Fixed a crash when configuring an audio effect with the Phonon dialogThierry Bastian2009-11-121-2/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-5731 Reviewed-by: jan-arve
| * | Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-1149-289/+516
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbrush.cpp
| | * | Fixed: QFontComboBox emits the currentFontChanged() signal twiceOlivier Goffart2009-11-112-2/+8
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2438 Reviewed-by: Thierry
| | * | QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal ↵Olivier Goffart2009-11-113-8/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrollbar If the vertical scrollbar is hidden, scroll using the other scrollbar. Reviewed-by: Thierry Task-number: QTBUG-1760
| | * | Small caps font variant wouldn't be used when defined through style sheetsGabriel de Dietrich2009-11-112-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The font comparison (operator==) didn't check the capital attribute, which is the one responsible for this variant. Now it does. Auto-test updated. Reviewed-by: Samuel Reviewed-by: Olivier
| | * | Fix Font combobox: one can set the current font without it being changedThierry Bastian2009-11-111-0/+7
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5693 Reviewed-by: ogoffart
| | * | QKeySequence::mnemonic: add a warning if the text contains severals '&'Olivier Goffart2009-11-112-9/+56
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5667 Reviewed-by: Gabriel
| | * | Revert "Always set a clip on the painter in QGraphicsView."Andreas Aardal Hanssen2009-11-112-75/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4bf7f90a27377f439e86d6175e5e3cdebd131be0. The change is already reverted in kinetic-declarativeui. Reviewed-by: Warwick Allison Reviewed-by: bnilsen
| | * | QDockWidget also emits dockLocationChanged when the state is restoredThierry Bastian2009-11-102-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...on the main window. Task-number: QTBUG-1304 Reviewed-by: ogoffart
| | * | Make it possible for QMainWindow to restore the geom of undocked widgetThierry Bastian2009-11-102-3/+19
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5663 Reviewed-by: ogoffart
| | * | Fixed: Stylesheet and background image issue in ScrollAreaOlivier Goffart2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using background-image and background-attachement: scroll and background-repeat: no-repeat The rectangle used to draw the image was not correctly computed. Reviewed-by: Thierry Task-number: QTBUG-3783
| | * | Menubars in dual screen mode now popup the menus on the correct screenThierry Bastian2009-11-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an item is split then its menu appears on the screen which contains most of it. Task-number: QTBUG-773 Reviewed-by: ogoffart
| | * | Replace most processEvents() with sendPostedEvents().Jan-Arve Sæther2009-11-101-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After a change Brad did to the event dispatcher we are no longer guaranteed that processEvents will process *all* events in the event queue. (most of the time _it_will_ process all events) I only replaced processEvents for the tests that failed.
| | * | Replace most processEvents() with sendPostedEvents().Jan-Arve Sæther2009-11-101-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After a change Brad did to the event dispatcher we are no longer guaranteed that processEvents will process *all* events in the event queue. (most of the time _it_will_ process all events) I only replaced processEvents for the tests that fail.
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-11-1019-115/+142
| | |\ \
| | | * | Make sure the context menus also clear the status tip when neededThierry Bastian2009-11-104-36/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2700 Reviewed-by: ogoffart
| | | * | Fixes sub-attaq segfault when pausingLeonardo Sobral Cunha2009-11-102-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sub-attaq's animation manager was accessing a deleted animation. Task-number: QTBUG-5646 Reviewed-by: thierry
| | | * | Fixes sub-attaq demo, unfreeze boat after launching new game when on pauseLeonardo Sobral Cunha2009-11-102-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5526 Reviewed-by: thierry
| | | * | Make sure that the toolbar is in the mainwinow rect for dockingThierry Bastian2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2598 Reviewed-by: ogoffart
| | | * | PlatformPlugin: Do not load the plugin if there is no GUIOlivier Goffart2009-11-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise valgrind might complain we use uninitialized value (when using the X11 structure) Reviewed-by: Gabriel
| | | * | Make the toolbar extension animated according to the main windowThierry Bastian2009-11-103-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would be always animated. Task-number: QTBUG-5623 Reviewed-by: Gabriel
| | | * | Make the new examples for effects use the Qt Animation FrameworkThierry Bastian2009-11-106-69/+84
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5640 Reviewed-by: Leo
| | * | | processEvents() does not always process *all* events in the queue.Jan-Arve Sæther2009-11-101-3/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | This was a small behaviour change introduced by Brad that caused the autotest to fail (not every time). Our workaround is to call sendPostedEvents().
| | * | Avoid XSync-related runtime crashes on HP-UX due to C++ mangling.Andreas Aardal Hanssen2009-11-102-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HP-UX is missing the extern "C" wrapper for its XSync function declarations. This caused applications to _build_ but not _run_ (i.e., all GUI apps crashed). Adding the wrapper should be harmless on all X11 platforms. Task-number: QTBUG-5524 Reviewed-by: Thiago
| | * | QGraphicsTextItem: update when changing the color.Olivier Goffart2009-11-092-0/+59
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5418 Reviewed-by: Gabriel
| | * | Fix docs for animation apiLeonardo Sobral Cunha2009-11-092-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All animation api code snippets should use references instead of local variables. Task-number: QTBUG-5616 Reviewed-by: thierry
| | * | Make sure the dock widget is updated when changing closable propertyThierry Bastian2009-11-092-0/+23
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-1665 Reviewed-by: ogoffart
| | * | Now looking for the closer dock area for toolbuttonThierry Bastian2009-11-092-30/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we were looking for the 1st one that fit or was not too far (ie 80px) away. Now we really take the closest one. Task-number: QTBUG-2598 Reviewed-by: ogoffart
| | * | QPlastiqueStyle: Fix painting QTreeView with gradientOlivier Goffart2009-11-091-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting a gradian brush as a base for a QTreeWidget (with stylesheet), the branch decoration would be plain black. This is because the color() of a gradient brush is always black. Fix it by using the base brush itself to paint the decoration if the brush is not solid color. Task-number: QTBUG-3816 Reviewed-by: Thierry
| | * | Fix warningsThierry Bastian2009-11-093-2/+3
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge commit 'c785d92153d23b836451b0643424b9871bcc4be9' into 4.6-upstreamBradley T. Hughes2009-11-132-0/+41
|\ \ \ \
| * \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-12226-22307/+23870
| |\ \ \ \
| * | | | | Make sure posted events are always sent when calling processEvents() on Win32Bradley T. Hughes2009-11-112-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 31f1ff910, posted events could be delayed by a previous call to processEvents(). This causes some tests to randomly fail, so bring back the invariant that processEvents() will always call sendPostedEvents() when called "manually" (i.e. not from exec()). Reviewed-by: Prasanth Ullattil
* | | | | | Fix typo in license headerAlessandro Portale2009-11-1227-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The word 'module' was missing. Reviewed-By: TrustMe
* | | | | | Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-12170-21338/+22776
|\ \ \ \ \ \
| * | | | | | Fixed searching and copy/paste from PDF documents.axis2009-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously copy and paste from PDFs made by Qt would paste garbage into the target document, and searching was not possible. The bug happened because the internal buffer would open its data stream in truncate mode rather than append mode, thereby losing content, and producing a slightly corrupted PDF. Task: QTBUG-4912 Task: QTBUG-3661 RevBy: Trond Kjernåsen
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-1227-46/+732
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/corelib/tools/qscopedpointer_p.h src/gui/widgets/qlcdnumber.cpp
generated by cgit v0.12 at 2025-01-29 14:46:54 (GMT)