summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed qdoc errors.Martin Smith2009-11-162-1/+9
|
* Doc: Adding explanation to QTextEditMorten Engvoldsen2009-11-161-1/+1
| | | | | | | Specifying explanation on tabStopWidth : int QTBUG-5470 David Boddie
* doc: Fixed qdoc errors.Martin Smith2009-11-162-4/+11
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Engvoldsen2009-11-163-16/+38
|\
| * doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-163-16/+38
| | | | | | | | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments.
* | Doc: Added short explanation to textEdit->toPlainText()Morten Engvoldsen2009-11-161-1/+3
|/ | | | Explaining(nbsp) the exception in character conversion.
* Don't sendPostedEvents() twice when calling processEvents() manuallyBradley T. Hughes2009-11-161-6/+6
| | | | | | | | | Commit fe0f807e1f4e7510c6d8cddd848bcbc25e358651 could cause sendPostedEvents() to be called twice, which caused regressions in tests/auto/qtimer. Fix this by only calling sendPostedEvents() "manually" if we didn't see a WM_QT_SENDPOSTEDEVENTS message. Reviewed-by: Prasanth Ullattil
* Designer crashes in Mac Cocoa port.Prasanth Ullattil2009-11-161-0/+3
| | | | | | | | | When we reparent a widget, it has to be removed from the old view before it is added to the new one. Otherwise this can cause the old view to have an invalid first responder, causing crash. Task-number: QTBUG-5327 Reviewed-by: Denis
* Fix compilation without Qt3support (on Windows CE, Symbian)Simon Hausmann2009-11-161-1/+1
| | | | | | Don't use QFile's Qt3support member, use fileName() instead. Reviewed-by: Trust me
* Fix input method support on widgets that have a focus proxy set.Simon Hausmann2009-11-132-9/+18
| | | | | | | | | When enabling/disabling a widget or changing its InputMethodEnabled attribute, use the focus proxy widget's input context for reset and for setting the focus widget on the input context. Task-number: QTBUG-5781 Reviewed-by: Denis
* Fix S60 input method not showing up in editable QGraphicsTextItemsSimon Hausmann2009-11-131-2/+3
| | | | | | | | 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
* Doc: fix typo.Volker Hilsheimer2009-11-131-1/+1
| | | | Fixes: QTBUG-5146
* xmlpatterns: unify error messages in generator and generated filePeter Hartmann2009-11-131-1/+1
| | | | | | | 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-1329-110/+143
|\
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1329-110/+143
| |\
| | * 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-1128-108/+140
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbrush.cpp
| | | * Fixed: QFontComboBox emits the currentFontChanged() signal twiceOlivier Goffart2009-11-111-1/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2438 Reviewed-by: Thierry
| | | * QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal ↵Olivier Goffart2009-11-112-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-4/+16
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5667 Reviewed-by: Gabriel
| | | * Revert "Always set a clip on the painter in QGraphicsView."Andreas Aardal Hanssen2009-11-111-3/+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-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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-101-3/+3
| | | | | | | | | | | | | | | | | | | | 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
| | | * Make sure the context menus also clear the status tip when neededThierry Bastian2009-11-104-36/+37
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2700 Reviewed-by: ogoffart
| | | * 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
| | | * Avoid XSync-related runtime crashes on HP-UX due to C++ mangling.Andreas Aardal Hanssen2009-11-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-0/+1
| | | | | | | | | | | | | | | | | | | | 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-091-0/+5
| | | | | | | | | | | | | | | | | | | | 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-131-0/+5
| |\ \ \
* | | | | 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-1318-108/+256
|\ \ \ \ \
| * | | | | 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-119-72/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | 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-091000-12844/+28591
| |\ \ \ \ \
| * | | | | | Let QDBusInterface work even if the introspection failed.Thiago Macieira2009-11-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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