summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-15112-347/+2039
|\
| * Fix glMatrixMode() arguments for desktop OpenGLRhys Weatherley2009-09-151-2/+2
| * Compilation fix for OpenGL/ES 2.0Rhys Weatherley2009-09-151-0/+2
| * Export a function for getting a IDirectFBWindowAnders Bakken2009-09-154-6/+34
| * Export two functions for getting a surface in dfbAnders Bakken2009-09-152-1/+14
| * Fix a bug in surfaceForWidgetAnders Bakken2009-09-151-1/+2
| * Stabilize tst_QComboBox::task260974_menuItemRectangleForComboBoxPopupOlivier Goffart2009-09-151-1/+1
| * Slightly better code for the test.Alexis Menard2009-09-151-5/+6
| * Fix macplist autotestJoão Abecasis2009-09-151-1/+0
| * Doc: Added missing files for the Designer manual.David Boddie2009-09-155-0/+0
| * Doc: Created a new Drawing Utility Functions page.David Boddie2009-09-152-16/+22
| * Doc: Cleaned up the Designer main window and Embedded Linux pages.David Boddie2009-09-159-129/+223
| * Increasing a timeout on QProcess testsJoão Abecasis2009-09-151-1/+1
| * I don't think this was intentional...João Abecasis2009-09-152-2/+0
| * Increased performance of blurpicker example with GL 2 engine.Samuel Rødal2009-09-151-8/+8
| * Fix QGraphicsView::scrollAfterResize autotest on Mac.Alexis Menard2009-09-151-3/+6
| * Change compile options for configure so it can be built using msvc2008Shane Kearns2009-09-151-0/+4
| * QCursor support for Symbian OSShane Kearns2009-09-1584-176/+1719
* | 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