summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-08405-4862/+4983
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Current Item was moved twice when an item was inserted before it.Martin Jones2009-09-081-1/+2
| |
| * Rest of change 28ccffc53df374f7b890510f481e2dae2e01ed74Warwick Allison2009-09-083-10/+288
| |
| * Missed icons.Warwick Allison2009-09-083-0/+0
| |
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-08393-4850/+4528
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-09-08375-4809/+4343
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Martin Jones2009-09-08372-4807/+4245
| | | |\ | | | | | | | | | | | | | | | kinetic-declarativeui
| | | | * Fixed the spelling of canceled in the QGesture api brought up by David Boddie.Denis Dzyubenko2009-09-072-6/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * Only depend on phonon when building webkit if phonon was configured forAndy Shaw2009-09-071-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis
| | | | * Remove extra invalid semi-colonThiago Macieira2009-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust Me
| | | | * Fixed compile failure on Mac OS X.Samuel Rødal2009-09-071-2/+1
| | | | |
| | | | * Network tests: Fix typo in network-settings.h to make it compileMarkus Goetz2009-09-071-1/+1
| | | | |
| | | | * tst_qnetworkreply: Check for NoError before event loop timeout.Markus Goetz2009-09-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure we show a proper "Host not found" error instead of the "Event loop timed out". Rev-By: Peter Hartmann
| | | | * Use icons on QDialogButtonBox in KDEJens Bache-Wiig2009-09-074-15/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oxygen did not use icons in dialogs. This is obviously incorrect compared with other KDE apps. We changed common style to enable button icons by default on X11 and explicitly disabled them for Windows and Motif styles. We also updated the icons for YES and NO actions to use dialog-ok and process-stop to reflect the usaged in KDE itself. Reviewed-by: ogoffart
| | | | * Fix warning when compiling with QT_NO_EXCEPTIONSOlivier Goffart2009-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/corelib/global/qglobal.h:1368:1: warning: "QT_NO_EXCEPTIONS" redefined Reviewed-by: Alexis
| | | | * Fix a crash in the Win32 event dispatcherBradley T. Hughes2009-09-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not clearing the timerVec and timerDict containers can cause crashes during application shutdown when code tries to unregister timers (that were unregistered in closingDown()). Reviewed-by: dt
| | | | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-0719-80/+283
| | | | |\
| | | | | * Fix crash on QGraphicsItem destruction related to focus handlingKai Koehne2009-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not call clearFocus() for child item in setParentItemHelper() if called from destructor: At this time, the ~QGraphicsItem destructor already deleted all its children. Reviewed-by: Andreas Aardal Hanssen
| | | | | * Doc: Minor adjustments to the rogue example docs.Geir Vattekar2009-09-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | * Fix QScriptEngineAgent::functionExit (JIT enabled)Jedrzej Nowacki2009-09-073-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event functionExit was fixed, now returnValue is correctly passed as an argument to debugger. Few QEXCEPT_FAIL were removed from autotest. Reviewed-by: Kent Hansen
| | | | | * Fix QScriptEngineAgent::exceptionCatch (JIT enabled)Jedrzej Nowacki2009-09-073-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event exceptionCatch fixed, now exceptionValue is correctly passed as an argument to debugger. Two QEXCEPT_FAIL were removed from autotest. Reviewed-by: Kent Hansen
| | | | | * Doc: Added a note that a state machine requires a running event loop.David Boddie2009-09-072-31/+26
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | * Fixed crash in print preview dialog with graphicssystem OpenGL.Kim Motoyoshi Kalland2009-09-071-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid crashing when framebuffer object created in one context is used in a shared context after the original context is destroyed. Task-number: 260874 Reviewed-by: Samuel
| | | | | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-0714-28/+473
| | | | | |\
| | | | | | * Doc: Some animation examples had no docs in qtdemo.Geir Vattekar2009-09-0710-1/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 260779 Reviewed-by: Morten Engvoldsen
| | | | | * | Re-added Symbian specific plugins documentation that had gotten lost.Miikka Heikkinen2009-09-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation structure changes had caused Symbian plugin documentation to be lost, so revised and re-added it to plugins-howto.qdoc. Reviewed-by: Janne Anttila
| | | | * | | Minor fix to network-settings.h in Symbian OSJanne Anttila2009-09-071-5/+4
| | | | | |/ | | | | |/| | | | | | | | | | | | | Reviewed-by: Aleksandar Sasha Babic
| | | | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-077-17/+296
| | | | |\ \
| | | | | * | New Benchmark: file:// with QFile vs QNetworkAccessManagerMarkus Goetz2009-09-073-0/+172
| | | | | |/ | | | | | | | | | | | | | | | | | | Reviewed-by: Leo
| | | | | * Fix some issues with Shift-selection in QAbstractItemViewFrank Reininghaus2009-09-072-4/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes some issues which occur when pressing the Shift key while selecting items (new unit tests included): 1. The offset of the visible area is missing at one point in QAbstractItemView::keyPressEvent, causing Shift-Arrow selection to fail if the view is scrolled down. 2. Shift-click and Shift-Arrow selection fail after a rubberband selection because d->pressedPosition does not correspond to a valid QModelIndex. The problems have been found in Dolphin: http://bugs.kde.org/show_bug.cgi?id=163451 Merge-request: 1426 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | | | | * Fix tst_QListView::task254449_draggingItemToNegativeCoordinates on MacOlivier Goffart2009-09-071-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, QWidget::repaint() is the same thing as update(), it needs to reenter the event loop to get processed (this has always been like that)
| | | | | * Fix for qfileinfo autotest: LocalDiskFile set also for non-existing filev4.6.0-tp1aavit2009-09-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 53576b4d3c3e7325d01efba6c4da80299492f2db introduced the behaviour that QFSFileEngine sets LocalDiskFlag regardless of whether the file exists or not, but it just did it for Windows. This change makes fsengine for unix/mac behave likewise. Reviewed-by: trustme
| | | | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-07161-653/+1774
| | | | |\ \ | | | | | |/
| | | | | * Fixed qsubmdiarea setFont test.Gabriel de Dietrich2009-09-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compared fonts didn't have the same styleHint because it's resolved setting the font. Reviewed-by: Olivier
| | | | | * Fix tst_QItemDelegate::task257859_finalizeEdit on MacOlivier Goffart2009-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qFindChildren<QWidget*> would also find the QFocusFrame in addition to the line edit
| | | | | * Fixed resolving colors of the form "rgb(r,g,b)" in SVGs.Kim Motoyoshi Kalland2009-09-071-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was introduced by 13bcc92274d52fa6df2d636c78cf6ea457d670aa. Instead of comparing only the beginning of a string with "rgb(", a full string compare was used. I also added some error handling to avoid crashing on noncompliant SVG files. Reviewed-by: Trond
| | | | | * Support setting font size in shorthand font propertiesEskil Abrahamsen Blomfeldt2009-09-072-2/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fontSizeAdjustment defaulted to 0 which means "medium" in internal semantics. This will override any font size you set in the short-hand. In other locations, fontSizeAdjustment defaults to -255 which has no meaning attached. To allow setting the font size in short-hand (as in "font: 20px Arial"), we can't default to a specific adjustment. Two tests are added: The first verifies the case that already worked, where you specify the font size using the "font-size" property. The other verifies the short-hand case and would previously fail. Task-number: 207189 Reviewed-by: Simon Hausmann
| | | | | * Stabilize QComboBox test.Olivier Goffart2009-09-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | On Mac, there is long fading animation before the popups hide
| | | | | * Stabilize QFontMetrics testOlivier Goffart2009-09-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, the text may be elided if we give the exact length as the size. Giving one pixel bigger makes sure the text is not elided
| | | | | * make JavaScriptCore compile on HPUXKent Hansen2009-09-077-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of circular dependency (don't include StructureChain.h from Structure.h). Disable some time stuff that isn't available on HPUX. Reviewed-by: Simon Hausmann
| | | | | * Stabilize QTreeView testOlivier Goffart2009-09-071-8/+8
| | | | | |
| | | | | * Fixed compilation error for qmdiarea and qmdisubwindow test.Gabriel de Dietrich2009-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | | | | * New function added to QScriptEngineAgent autotestJedrzej Nowacki2009-09-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function convert numeric ScriptEngineEvent::Type to QString. It is not used in test but really useful in debugging Reviewed-by: Kent Hansen
| | | | | * Few expected fails were fixed in QScriptEngineAgentJedrzej Nowacki2009-09-075-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionExit event was partially fixed. The time point in JS execution with JIT enabled works now but still there is no returning value in few cases. Autotest was corrected. Reviewed-by: Kent Hansen
| | | | | * Fix tiled blit in 16-bit modePaul Olav Tvete2009-09-071-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimizations in change 8e447e8a did not handle the case when the target width is less than the width of a tile. Task-number: 260759 Reviewed-by: Samuel
| | | | | * Make dynamic cube maps work again in boxesRhys Weatherley2009-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-072-2/+8
| | | | | |\
| | | | | | * Mark these as fix later.Bill King2009-09-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unicode logic is beyond me, leave these for fixing by someone else with more unicode knowledge.
| | | | | | * DB2 - Don't return an error when the table is just empty.Bill King2009-09-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the behaviour consistent with the ODBC driver behaviour Reviewed-by: Justin McPherson
| | | | | * | qdoc: improve the QGLFormat documentationRhys Weatherley2009-09-071-17/+20
| | | | | |/ | | | | | | | | | | | | | | | | | | Reviewed-by: trustme