summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
| * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-07161-653/+1774
| |\ \
| * | | Createpackage support for signing SIS with multiple certificates.Janne Anttila2009-09-071-27/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit extends createpackage with capability to sign the SIS file with several certificates. The certificates need to be listed in text file. The file can have several certificates, each specified in separate line. The certificate, key and passphrase in line must be ';' separated. Lines starting with '#' are treated as a comments. Also empty lines in the file are ignored. The paths in certificate info file can be absolute or relative to the given file. Example syntax for certificateinfo file (mycerts.txt): # This is comment line, also the empty lines are ignored rd.cer;rd-key.pem .\cert\mycert.cer;.\cert\mykey.key;yourpassword X:\QtS60\selfsigned.cer;X:\QtS60\selfsigned.key To use this file the creatapackage has to be invokes as follows: createpackage.pl -c=mycerts.txt templatepkg release-armv5 Reviewed-by: Shane Kearns Reviewed-by: Miikka Heikkinen
* | | | 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
* | | 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
* | 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
* | Sample buffers are on by default for OpenGL/ES 2.0, off for others.Rhys Weatherley2009-09-071-0/+6
| | | | | | | | Reviewed-by: trustme
* | Unit tests for QGLFormat option constructorRhys Weatherley2009-09-071-0/+10
| | | | | | | | Reviewed-by: trustme
* | Unit tests for QGLFormat::defaultFormat and ::defaultOverlayFormat()Rhys Weatherley2009-09-071-0/+41
| | | | | | | | Reviewed-by: trustme
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-071-2/+2
|\ \
| * \ Merge branch '4.5' into 4.6Rohan McGovern2009-09-071-2/+2
| |\ \
| | * | Fixed compile on Solaris.Rohan McGovern2009-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `test' builtin in Solaris' /bin/sh does not understand `-e', use `-f' instead. Fixes: configure: test: argument expected Note, using the `-nokia-developer' configure option hides this breakage. Reviewed-by: Rhys Weatherley
* | | | Unit tests for QGLFramebufferObjectFormatRhys Weatherley2009-09-071-0/+56
|/ / / | | | | | | | | | Reviewed-by: trustme
* | | Performance: Convert QGLFormat to use implicit sharingRhys Weatherley2009-09-073-7/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLFormat was being deep-copied many times per frame because of code like this: if (context()->format().doubleBuffer()) { ... This change modifies QGLFormat to use implicit sharing to reduce the overhead of the above type of checks. Reviewed-by: Sarah Smith
* | | Unit tests for QGLFormat copy constructor and operator=Rhys Weatherley2009-09-061-0/+14
| | | | | | | | | | | | Reviewed-by: trustme
* | | Update QGLFormat::operator== to include all fields.Rhys Weatherley2009-09-062-1/+89
| | | | | | | | | | | | | | | | | | | | | The documentation says "Returns true if all the options of the two QGLFormats are equal", but that's not what it was doing. Reviewed-by: Sarah Smith
* | | Code cleanup: remove friend declarations for non-existent functionsRhys Weatherley2009-09-061-4/+0
| | | | | | | | | | | | Reviewed-by: Alex
* | | Make QGraphicsShaderEffect private API for 4.6Rhys Weatherley2009-09-067-19/+29
| | | | | | | | | | | | | | | | | | | | | The custom shader code in the OpenGL2 paint engine needs time to mature before we make this official public API. Reviewed-by: trustme
* | | Fixed "multiple definition of `QTest::mouseActionNames'" error inRohan McGovern2009-09-051-1/+2
| | | | | | | | | | | | projects where two separate compilation units include `qtestmouse.h'.
* | | Fixed compile of code which defines QT_NO_CAST_FROM_ASCII and includesRohan McGovern2009-09-051-1/+1
| | | | | | | | | | | | qtestmouse.h.
* | | Merge branch '4.5' into 4.6Rohan McGovern2009-09-053-42/+14
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/itemviews/qlistview.cpp
| * | Remove license header, which cannot be parsed by Sun assembler.Rohan McGovern2009-09-051-40/+0
| | | | | | | | | | | | | | | Commit 2e0d78836becf24c7f27c982316cf1b4492f27aa fixed this for i386 but omitted the fix for x86_64.
| * | Fix pixel snow on the combo box popup on Snow Leopard.Morten Sorvig2009-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | On 10.5 and below the pixmap data bytes happened to be initialized by malloc, on 10.6 this is no longer the case. Revby: Gunnar Sletta <gunnar@trolltech.com> Similar to 28f94e1ef94f.
| * | Wizard background images incorrect in Snow Leopard.Prasanth Ullattil2009-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | We need to clear the QPixmap before the image is drawn using the CGContextDrawImage(). Reviewed-by: Norwegian Rock Cat
generated by cgit v0.12 at 2024-11-26 23:30:37 (GMT)