summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev-nokia.troll.no:qt/kinetic...Andreas Aardal Hanssen2009-09-152-2/+7
|\
| * Do not crash in QmlInfo if debugging information is missingKai Koehne2009-09-152-2/+7
* | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-1534-163/+292
|\ \
| * | Make the scrollUpdate test function work.Jan-Arve Sæther2009-09-151-1/+1
| * | Fix a bug in FocusScopes; ensure subFocus is set correctly.Andreas Aardal Hanssen2009-09-152-1/+19
| * | Remove unused signal declaration.Andreas Aardal Hanssen2009-09-151-1/+0
| * | Removed a debug output that was a bit annoyingThorbjørn Lindeijer2009-09-151-2/+1
| * | doc: Fixed some qdoc errors.Martin Smith2009-09-152-22/+22
| * | When parsing a java file do not simply ignore the first character.Jan-Arve Sæther2009-09-151-1/+0
| * | Fix linenumbers.Jan-Arve Sæther2009-09-152-3/+3
| * | Removed GL1 pixmap filters and ported colorize filter to GL2 engine.Samuel Rødal2009-09-153-61/+22
| * | QNativeSocketEngine on Windows: don't bail out on non-fatal errorPeter Hartmann2009-09-151-3/+9
| * | Don't do pixel tests in QGraphicsEffect on other than 32-bit display.Ariya Hidayat2009-09-151-0/+11
| * | Fix ambiguous overload for QTileRules constructorOlivier Goffart2009-09-153-3/+7
| * | Doc: Added some snippets to the multimedia audio docs.Geir Vattekar2009-09-155-5/+127
| * | Made QGraphicsBlurEffect use the high blur quality setting.Samuel Rødal2009-09-151-0/+2
| * | Fixed QLineEdit to pass the tst_QLineEdit::displayText() autotest.Kim Motoyoshi Kalland2009-09-152-2/+9
| * | Fixed rendering errors in blurpicker with -graphicssystem openglSamuel Rødal2009-09-152-1/+16
| * | doc: Fixed some qdoc errors.Martin Smith2009-09-153-45/+29
| * | Export again qt_set_sequence_auto_mnemonicOlivier Goffart2009-09-151-1/+1
| * | Make test pass on WindowsPaul Olav Tvete2009-09-151-1/+3
| * | Make the test work with shadow builds.Paul Olav Tvete2009-09-152-10/+10
* | | Focus changes to QFxItem and QFxView.Andreas Aardal Hanssen2009-09-156-43/+43
* | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-158848-56992/+41657
|\ \ \ | |/ / | | / | |/ |/|
| * Support for focus scopes: QGraphicsItem::ItemIsFocusScope.Andreas Aardal Hanssen2009-09-156-36/+266
| * Fix bugs in handling of initial focus.Andreas Aardal Hanssen2009-09-152-2/+63
| * Remove this line; which no longer has any effect.Andreas Aardal Hanssen2009-09-152-2/+5
| * Fix tst_QWidget::inputFocus_task257832 on WindowsJan-Arve Sæther2009-09-151-0/+1
| * Fix auto-test in QGraphicsItem.Alexis Menard2009-09-151-4/+2
| * Bauhaus widgetbox drag and drop not working in CocoaPrasanth Ullattil2009-09-151-0/+4
| * Added support in qimagereader to base plugin selection on stream contentGunnar Sletta2009-09-153-10/+120
| * Test if the direction influences the returned graphics anchor object.Jan-Arve Sæther2009-09-151-1/+7
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-153-15/+97
| |\
| | * Fix update issues in QGraphicsView.Alexis Menard2009-09-153-15/+97
| * | Don't round-trip to GL server for glGetError() in release mode.Rhys Weatherley2009-09-151-1/+10
| |/
| * qdoc: Shift snippets in QGLShaderProgram out into doc/src/snippetsRhys Weatherley2009-09-152-49/+95
| * Merge commit 'origin/4.5' into 4.6Bill King2009-09-143-4/+69
| |\
| | * Fixes QSqlTableModel: trying to delete the wrong row.Bill King2009-09-142-4/+66
| | * Fixes crash when calling numRows on unknown query type (ibase)Bill King2009-09-141-0/+3
| * | Remove spurious, wrong semi-colonThiago Macieira2009-09-141-1/+1
| * | Fix closing the menu of a QMenuBar with the mouseOlivier Goffart2009-09-141-1/+3
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-141-1/+1
| |\ \ | | |/
| | * Fixed off-by-one error in call to XGetKeyboardMapping that meant that max_key...Thomas Sondergaard2009-09-141-1/+1
| | * Clean up properly in the QPF1 font enginePaul Olav Tvete2009-09-141-0/+6
| * | Make qtest_gui.h define QT_GUI_LIB to enable GUI tests.Thiago Macieira2009-09-141-0/+8
| * | Move the QT_GUI_LIB check to qtestevent.h instead of qtestmouse.h.Thiago Macieira2009-09-143-2/+4
| * | Add an example that shows strength animation QGraphicsColorizeEffect.Ariya Hidayat2009-09-148-1/+274
| * | Fixed gradient referencing in SVGs.Kim Motoyoshi Kalland2009-09-149-159/+135
| * | Add filter strength to QGraphics[Colorize,Grayscale]Effect.Ariya Hidayat2009-09-144-1/+126
| * | Add simple autotest for QGraphicsColorizeEffect.Ariya Hidayat2009-09-141-0/+25