summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | utils/qlalr generator: adapt changes to xmlstream and script filesPeter Hartmann2009-11-1111-108/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some changes were made to qxmlstream_p.h and script files directly; however, those files are generated automatically by src/corelib/xml/make-parser.sh and src/script/parser/make-parser.sh, respectively, so the generator would overwrite the manual changes to the files the next time it is run. This patch integrates those changes into the generator rather than into the files directly. Reviewed-by: Roberto Raggi Reviewed-by: Olivier Goffart
| | * | | | stabilize QNetworkReply autotestPeter Hartmann2009-11-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ioPostToHttpFromSocket was failing from time to time Reviewed-by: Markus Goetz
| | * | | | QNAM HTTP Code: Start accept-language header with capital letterMarkus Goetz2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP header names are case insensitive, but stick to what all browsers etc. use to work around buggy servers. Reviewed-by: TrustMe
| | * | | | Merge branch '4.6' into core-4.6Thiago Macieira2009-11-091383-45740/+41718
| | |\ \ \ \
| | * | | | | Let QDBusInterface work even if the introspection failed.Thiago Macieira2009-11-092-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the introspection failed, we won't have a meta object, meaning you cannot connect to signals or invoke methods via the slot mechanism. But you can still make calls. The isValid() functionality is preserved because there is no owner for this object. Reviewed-By: Harald Fernengel
| | * | | | | network examples: unify the fortune server/client examplesPeter Hartmann2009-11-094-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always use the first non-localhost IP address to listen/connect to, if there is one. Reviewed-by: Markus Goetz
| | * | | | | QNAM HTTP Code: Also send our locale name as accept-languageMarkus Goetz2009-11-091-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by merge request 2012 by Joel Nordell Reviewed-by: Peter Hartmann
| | * | | | | Fix annotations added for complex types in signals.Thiago Macieira2009-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signals are badly mishandled in QtDBus. In the spec, they are "in" arguments, but we generate "Out" annotations for them. What's worse, we were using the wrong count. QTBUG-914 is about fixing the directionality. While that task isn't fixed, at least use the right count. Task-number: QTBUG-5563 Reviewed-by: TrustMe
| | * | | | | Fix enabling of level 2 debugging in QtDBusThiago Macieira2009-11-081-1/+2
| | | | | | |
| | * | | | | Autotest: prevent race-condition from causing a test failure.Thiago Macieira2009-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test requires receiving the NameOwnerChanged signal from the bus before the voidSignal we emit ourselves. For whatever reason, the bus apparently delays the emission of that signal, which could cause our signal to be received first. We should actually wait for the signal, but a simple processEvents is enough in my tests.