summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Tom Cooksey2009-09-1762-506/+4989
|\ | | | | | | | | Conflicts: tests/auto/qtwidgets/tst_qtwidgets.cpp
| * Fixed the invalid license header.Trond Kjernåsen2009-09-171-39/+39
| | | | | | | | | | | | This caused the tests/header test to fail. Reviewed-by: Kim
| * Clean up my previous commit (remove comment and whitespace fix)Jan-Arve Sæther2009-09-171-3/+1
| |
| * Fix the scrollTo() test function on Windows.Jan-Arve Sæther2009-09-171-4/+7
| | | | | | | | | | | | | | | | | | | | After the QTRY_COMPARE was added, the size of the view suddenly became a hard requirement. However, this reqirement was not met on windows, since the forcedSize was smaller than the minimum size allowed for the view. Thus, it would never have its size set to forcedSize and the QTRY_COMPARE would fail.
| * Fixed a bug in QToolTip when internal tool tips where reused.Trond Kjernaasen2009-09-172-6/+11
| | | | | | | | | | | | | | | | | | If a tool tip is to be reused, it *has* to be visible otherwise it *may* get destroyed by the expiration timer before the timer is reset. The tst_qtooltip::setPalette() test triggered this obscure bug under Windows. Reviewed-by: Kim
| * Implement hasConflicts().Jan-Arve Sæther2009-09-177-96/+176
| |
| * Fix regression after code reviewShane Kearns2009-09-172-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | The branch maintained its own set of native windows. This was commented to be a duplication of the native window list kept by QWidgetPrivate, and changed. Unfortunately, the set maintained on the branch contained only window owning controls, while the list kept by QWidgetPrivate contains all widgets that have a CCoeControl. Added a check for whether the control is window owning before using its DrawableWindow() to avoid getting a null pointer. Reviewed-by: Jason Barron
| * Update def filesShane Kearns2009-09-178-12/+749
| | | | | | | | | | | | | | DEF files for ARMv5 UREL, that include the autotest exports. Note that Q_AUTOTEST_EXPORT is only on by default in internal builds Reviewed-by: Iain
| * Fix unused variable compiler warningShane Kearns2009-09-171-1/+0
| | | | | | | | | | | | Removed UID that wasn't used. Reviewed-by: Jason Barron
| * Enable compiling Symbian port with QT_NO_CURSORShane Kearns2009-09-175-5/+24
| | | | | | | | | | | | | | Added some missing #ifdef QT_NO_CURSOR, so the symbian port still compiles if this feature is configured out. Reviewed-by: Jason Barron
| * Fix glyph selection in symbol fonts that contain unicode cmap tableEskil Abrahamsen Blomfeldt2009-09-171-14/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | Some symbol fonts will contain a unicode cmap table in addition to the microsoft symbol cmap table that maps the symbol range (private range 0xf000 - 0xf100) into the correct glyphs. This is essentially a broken unicode table, and we should not prefer it if these conditions are true. In the strict cases where these conditions apply, we fall back to the symbol table instead. Task-number: QT-2354 Done-with: Lars Reviewed by: Lars
| * Wrong string when setting formula through menu in demos/spreadsheet.Gabriel de Dietrich2009-09-171-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe Task-number: 260975 Task-number: QT-4506
| * Merge branch 'orbit-fixes' into 4.6Jan-Arve Sæther2009-09-176-72/+3245
| |\
| | * Add QEXPECT_FAIL for the one test that fails.Jan-Arve Sæther2009-09-171-0/+2
| | | | | | | | | | | | | | | Note that t does not fail with simplification turned off (QT_ANCHORLAYOUT_NO_SIMPLIFICATION=1)
| | * Add QTest::ignoreMessage() calls in order to reduce some console noise.Jan-Arve Sæther2009-09-171-0/+28
| | |
| | * QGraphicsAnchorLayout: Added new autotests fileJesus Sanchez-Palencia2009-09-173-0/+3067
| | | | | | | | | | | | | | | | | | | | | | | | Several autotests written by the Orbit team were added as a new QGraphicsAnchorLayout autotests file. Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * QGraphicsAnchorLayout: Remove QGALPrivate::deleteAnchorData()Eduardo M. Fleury2009-09-172-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method, formerly called by the QGraphicsAnchor destructor, to remove the anchor associated to it, is no longer needed. That destructor now calls QGALPrivate::removeAnchor(), a method analagous to addAnchor(), that provides the high level feature of "anchor removal". Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| | * QGraphicsAnchorLayoutPrivate: Removing item from layout when there are no ↵Jesus Sanchez-Palencia2009-09-172-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more anchors Now the removeAnchor() method has returned and it is ready for being use in the API for ensure that items are removed from the layout when they have no more external anchors. Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * QGraphicsAnchorLayoutPrivate: Removing method removeAnchor()Jesus Sanchez-Palencia2009-09-172-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | All method calls were replaced by calling removeAnchor_helper(), with internalVertex() calls Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * QGraphicsAnchorLayout: Removing methods names inconsistencies on private classJesus Sanchez-Palencia2009-09-173-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsAnchorLayoutPrivate now has addAnchor() replacing anchor() and addAnchor_helper() replacing addAnchor(). With this changes we are respecting the API behavior, where anchor() is a "getter" instead of a "setter". Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * QGraphicsAnchorLayout: Handle negative spacing in "setAnchorSpacing"Eduardo M. Fleury2009-09-171-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The simplex solver cannot handle negative-sized anchors. Those should be handled by the layout itself. This is done by inverting such anchors and making their size positive again. Ie. A --> B with size -10 becomes B --> A with size 10 Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| | * QGraphicsAnchorLayout: Fix anchor creation heuristicsEduardo M. Fleury2009-09-171-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the case where creating an anchor between the layout Left edge and an item Right edge (or vice-versa) would have different behaviors depending on the argument order. Now both calls below have the same meaning: addAnchor(layout, Qt::AnchorLeft, widget, Qt::AnchorRight) addAnchor(widget, Qt::AnchorRight, layout, Qt::AnchorLeft) Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| * | Control-drag header selection behaved wierdly.Gabriel de Dietrich2009-09-174-2/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QItemSelectionModel::Current was not set in QTableViewPrivate::selectColumn(). However, Control-drag selection in QTableView behaved differently than other software such as OpenOffice's spreadsheet. Now the behaviour when Control-dragging is that the selection will be set to the opposite of the selection state of the first cell. If that cell is selected, we will deselected the cells while dragging, and conversely, if it isn't selected, the cells will be selected. Reviewed-by: Olivier Task-number: QT-1435 Task-number: 191545
| * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt-releases; branch ↵Jason McDonald2009-09-171-4/+14
| |\ \ | | | | | | | | | | | | '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| | * | Fixed QFileInfo autotest absolute path tests not to expect C-drive.Miikka Heikkinen2009-09-171-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | Changed absolute path tests so that they will work from any drive. Reviewed-by: Shane Kearns
| * | | Fix license headers.Jason McDonald2009-09-177-2/+287
| |/ / | | | | | | | | | Reviewed-by: Trust Me
| * | Stabilize tst_QGraphicsItem::hoverEventsGenerateRepaints.Bjørn Erik Nilsen2009-09-171-9/+7
| | | | | | | | | | | | | | | Make the test independent of window activation; we're only interested in the behavior for hover events.
| * | Stabilize tst_QGraphicsItem::cacheMode on the Mac.Bjørn Erik Nilsen2009-09-171-0/+3
| | | | | | | | | | | | | | | Problem was that the window got activated *after* the items were added to the scene, causing two repaints on the viewport.
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-1714-35/+299
| |\ \ | | |/
| | * Add a new wildcard mode similar to bash in QRegExpBenjamin Poulain2009-09-173-19/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not possible to escape a wildcard character in the Wildcard mode of QRegExp. This follows the kind of wildcard of the CLI of Windows The new WildCardUnix follows the escaping of a unix's bash. Task-number: 241346 Reviewed-by: Olivier Goffart Reviewed-by: Matthew Cattell
| | * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-1710-16/+109
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Morten Sorvig2009-09-17536-274/+239080
| | |\ \
| | * | | Improve font handling on Mac/Cocoa.Morten Sorvig2009-09-161-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mac/Cocoa font database currently relies on two APIs, ATSUI (old) and CoreText (new). These are interchangable and work on the same font database. Some differences do exist, in particular ATSFontFamilyGetName seems to return the same as ATSFontGetName for some fonts - the font name, not the family name. In any case, the old ATS code path is initializing QFontDatabase::familes() with the font name. This causes a naming mismatch with code that uses CoreText and gets the proper family name, in this case in initializeDb(). The fix is to make sure the correct family name is used by using the CoreText API to access it. RevBy: TrustMe
| * | | | Fix qdoc warning about missing fileSarah Smith2009-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-17543-312/+239136
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | qdoc: QGLContext::drawTexture referring to itself.Rhys Weatherley2009-09-171-4/+0
| | | | |
| | * | | Revert "Added support for subpixel antialiasing on text in the GL2 engine."Rhys Weatherley2009-09-178-181/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breaks the GL2 paint engine on X11 and OpenGL/ES 2.0. This reverts commit b8ff02a67ebd8246253823b53cfed98eef400547.
| | * | | Simplify QDirectFBPixmapData::fromDataBufferAnders Bakken2009-09-161-48/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need for the intermediate surface creation. RenderTo will handle things like palette/transparency etc. Should also provide some speedup. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | | Make QT_DIRECTFB_PALETTE an opt-in optionAnders Bakken2009-09-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems not work correctly on quite a few boards so I'd rather have people turn it on explicitly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | | have make_qfeatures_dot_h use QTSRCDIR if defined, update qfeatures.hJeremy Katz2009-09-162-17/+22
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Paul
| | * | | QGlobal: fix Windows error reportingPeter Hartmann2009-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before, we did not retrieve the detailed error message correctly on Windows. Reviewed-by: Joao
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-16157-592/+3007
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-1587-812/+1571
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-144-27/+51
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-13142-20185/+2731
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-108810-35831/+36567
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-09122-1905/+2054
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-0865-249/+1096
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-07324-4581/+3215
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove redundant includeSarah Smith2009-09-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race. Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-09-06 06:55:06 (GMT)