summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Define highp to mediump on OpenGL/ES systems that don't have highpRhys Weatherley2009-08-271-0/+15
* Remove extraneous semi-colonsRhys Weatherley2009-08-272-3/+3
* Rearrange ifdefsAnders Bakken2009-08-271-3/+1
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-27125-511/+3640
|\
| * QAbstractAnimation: fixes segfault when deleting animation inside updateCurre...Leonardo Sobral Cunha2009-08-273-13/+68
| * work around a compiler bug (gcc <= 4.0.x) that renders the drop-in versionhjk2009-08-271-0/+6
| * Merge branch '4.6'Thiago Macieira2009-08-27327-6040/+11275
| |\
| | * Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-08-271-0/+114
| | |\
| | | * Add an autotest to check reparenting a QGLWidget worksTom Cooksey2009-08-271-0/+68
| | | * Add an autotest to check rendering to a QGLWidget worksTom Cooksey2009-08-271-0/+46
| | * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-2786-206/+2643
| | |\ \ | | | |/ | | |/|
| | | * QSslSocket: Clarified doc about QSslSocket::systemCaCertificatesMarkus Goetz2009-08-271-4/+2
| | | * Add missing license headers and adjust test data to match.Jason McDonald2009-08-2786-236/+2448
| | | * Fix duplicated license headers.Jason McDonald2009-08-278-328/+0
| | | * Fix some duplicated license headers.Jason McDonald2009-08-2714-574/+0
| | | * QImageReader via JPEG image load plugin fails to load correctly a CMYKKeith Isdale2009-08-271-1/+10
| | | * Adjusting ftp server address for Nokia network.Jesper Thomschütz2009-08-261-1/+1
| | | * Fix subControlRect of the Mac style for the QComboBoxBenjamin Poulain2009-08-252-3/+60
| | * | Fixed path filling in the GL2 paint engine.Kim Motoyoshi Kalland2009-08-271-1/+1
| | * | QTabBar: Fix the position of button in tabs.Olivier Goffart2009-08-272-8/+10
| | * | QTabBar: fix text being croped when there is an icon on the tabOlivier Goffart2009-08-272-19/+12
| | * | Refactor the way QCommonStyle layout the tabOlivier Goffart2009-08-272-81/+87
| | * | QNAM HTTP Code: Optimize connectionCloseEnabledMarkus Goetz2009-08-274-9/+15
| | * | Doc: Explained how mouse events are handled by QGraphicsView.Geir Vattekar2009-08-271-3/+5
| | * | Gestures: Implement swipe gestureRichard Moe Gustavsen2009-08-278-7/+183
| | * | Demo browser: Less verbose statistics in console outputMarkus Goetz2009-08-271-1/+4
| | * | QNAM HTTP Code: Moved isSocket* functions to channel objectMarkus Goetz2009-08-274-32/+29
| | * | Fix compile error on WindowsPrasanth Ullattil2009-08-272-2/+2
| * | | compile x11Gunnar Sletta2009-08-271-1/+1
| * | | Introduce QGraphicsItem::ItemIsPanel, light-weight window.Andreas Aardal Hanssen2009-08-269-139/+467
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-262234-44956/+173746
| |\ \ \
| | * | | make x11 compile...Gunnar Sletta2009-08-261-3/+3
| | * | | New variant of QGLContext::bindTexture that does not require mipmap generationGunnar Sletta2009-08-269-89/+308
| | * | | Also changing test ftp server address here to reflect nokia network settings.Jesper Thomschütz2009-08-261-1/+1
| | * | | Fix another minor copy'n'paste error from QLineControl refactoringAlan Alpert2009-08-261-2/+2
| * | | | Doc: Noted the limitation on using slashes in settings section names.David Boddie2009-08-261-3/+3
| * | | | Doc: Moved a link to the deployment documentation and added another.David Boddie2009-08-202-6/+10
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-2057-871/+1601
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-19207-1342/+3165
| |\ \ \ \ \
| * | | | | | Doc: Fixed copy-paste error.David Boddie2009-08-191-1/+1
* | | | | | | Doc: Added suggestion about decoding arguments from argv. Tidying up.David Boddie2009-08-271-26/+44
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2721-3924/+3599
|\ \ \ \ \ \
| * | | | | | QPropertyAnimation: small refactor and we got rid of QMetaPropertyThierry Bastian2009-08-272-30/+14
| * | | | | | Fixed compilation on AIX.Kim Motoyoshi Kalland2009-08-271-2/+2
| * | | | | | Gestures: make all screen points floatRichard Moe Gustavsen2009-08-273-16/+16
| * | | | | | Mac: Fix Imageviewer example, and bugfix gesturesRichard Moe Gustavsen2009-08-275-251/+82
| * | | | | | Cocoa: implement pan gestures to follow mouseRichard Moe Gustavsen2009-08-272-13/+14
| * | | | | | Cocoa: Implement single touch panRichard Moe Gustavsen2009-08-275-61/+85
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-2752-264/+1102
| |\ \ \ \ \ \
| | * | | | | | Make it compile on Windows CE where min and max are predefined macros.Jan-Arve Sæther2009-08-271-11/+11