summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix S60 input method not showing up in editable QGraphicsTextItemsSimon Hausmann2009-11-132-2/+6
| | | | | | | | Correctly set the ItemAcceptsInputMethod flag in setTextInteractionFlags. Reviewed-by: Andreas Reviewed-by: axis Reviewed-by: Janne Koskinen
* Fix compilation on solaris-g++-64.Thiago Macieira2009-11-131-0/+1
| | | | | | | | Add the "reserved" member to QVectorData in that configuration. Since this is only about the bootstrapped version of Qt, there are no binary compatibility issues. Reviewed-by: Bradley T. Hughes
* Autotest: use the new QDBusServiceWatcher classThiago Macieira2009-11-131-13/+9
|
* Merge branch '4.6' of ../qt-doc-team into 4.6David Boddie2009-11-132-0/+267
|\
| * Doc: Added missing example documentation.David Boddie2009-11-132-0/+267
| | | | | | | | Reviewed-by: Trust Me
* | Doc: Add link to the Symbian Introduction.Volker Hilsheimer2009-11-131-0/+2
| |
* | Doc: fix typo.Volker Hilsheimer2009-11-131-1/+1
| | | | | | | | Fixes: QTBUG-5146
* | xmlpatterns autotest: adjust line endingsPeter Hartmann2009-11-131-1/+3
| | | | | | | | | | | | | | all test machines have "autocrlf = false", we need to adjust the tests to that. Reviewed-by: Frans Englich
* | xmlpatterns: unify error messages in generator and generated filePeter Hartmann2009-11-132-2/+2
| | | | | | | | | | | | | | An error message was changed in a cpp file, and this patch changes it also in the file it is generated from. Reviewed-by: Frans Englich
* | Introduce QFileNetworkReply in QNetworkAccessManagerMarkus Goetz2009-11-134-0/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | The QFileNetworkReply is a wrapper around QFile that has therefore similar performance. This avoids the usage of the unperformant QNetworkAccessFileBackend. The benchmark qfile_vs_qnetworkaccessmanager shows that the QFileNetworkReply's performance is better than 0.9x of QFile compared to QNetworkAccessFileBackend which had about 0.5x of QFile. Reviewed-by: Peter Hartmann
* | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1351-292/+523
|\ \
| * | 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 branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-11-1329-161/+339
|\ \ \ \ \
| * | | | | doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-131-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments.
| * | | | | Merge commit 'coreteam/4.6' into oslo1-4.6Marius Storm-Olsen2009-11-1328-155/+331
| |\ \ \ \ \
| | * | | | | tst_qnetworkreply: Test LastModified parsingMarkus Goetz2009-11-111-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Someone complained about it giving wrong values, however this test passes at least here on my Linux box. Reviewed-by: Peter Hartmann
| | * | | | | QNAM: Parse RFC1123 directly and don't go through QLocaleHolger Hans Peter Freyther2009-11-111-8/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QDateTimeParser forces at least two QString allocations to convert the Month string into a integer. This makes parsing the date string the most expesnsive operation from within replyHeaderChanged. Use sscanf to parse the RFC1123 header to get a significant speedup. Use a switch case statement to convert the month name to a integer. Reviewed-By: Markus Goetz
| | * | | | | QNAM: Remove some more occurences of toLower on the hot pathHolger Hans Peter Freyther2009-11-113-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toLower will force a memory allocation, and memory allocations are certainly adding a delay. Use qstricmp were this is easily possible. This change makes headerValues et all drop out of the profile. QChar::toLower will now be called more often, specially for loops that do linear searching. In the profile with real web content this is faster than using QByteArry::toLower in the inner loop and the forced memory allocations. Reviewed-By: Markus Goetz
| | * | | | | QNAM: Avoid using toLower for case insensitive comparisionHolger Hans Peter Freyther2009-11-111-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using qstricmp is faster on the desktop than the alloc of QByteArray::toLower and the QByteArray::operator==. QChar::toLower will now be called for the input key from within the loop. In the measurements done this is still a performance improvement over the allocation done by QByteArray::toLower. For more header values this might not be the case anymore. RESULT : tst_Loading::byteArrayTestLower(): 0.00076 msec per iteration (total: 25, iterations: 32768) RESULT : tst_Loading::byteArrayTestCompare(): 0.00028 msec per iteration (total: 37, iterations: 131072) Reviewed-By: Markus Goetz