summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix compilation of builds without WebKitSimon Hausmann2010-01-121-1/+1
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMorten Johan Sørvig2010-01-12178-1577/+5492
|\
| * Autotest: add a local version of the tst_QHttp::connectionClose testThiago Macieira2010-01-111-11/+19
| * Update reference to renamed file in completer example.ck2010-01-111-1/+1
| * Add QT_{BEGIN,END}_NAMESPACE to qtextureglyphcache_gl.cpp.ck2010-01-111-0/+4
| * Use the new QTextCodec api in the QXmlStreamWriter.Denis Dzyubenko2010-01-081-5/+2
| * Added new functions to QTextCodec that accept ConversionFlags.Denis Dzyubenko2010-01-082-3/+57
| * Rename files in completer example since QDirModel is not used.Alexis Menard2010-01-084-18/+18
| * Obsolete QDirModel and remove it from the doc.Alexis Menard2010-01-0813-35/+98
| * Merge branch '4.6'Thiago Macieira2010-01-08150-1477/+5145
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-0825-124/+186
| | |\
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Kurt Korbatits2010-01-07434-5810/+18922
| | | |\
| | | | * Merge branch '4.6' of ../../4.6 into 4.6Justin McPherson2010-01-07433-5802/+18914
| | | | |\
| | | | * | Fix warning in qfilesystemmodel_p.hJustin McPherson2010-01-071-8/+8
| | | * | | QAudioInput loses data on Maemo5/other linux platforms.Kurt Korbatits2010-01-071-1/+1
| | | |/ /
| | | * | Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-0624-90/+142
| | | * | Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-0616-22/+32
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-078-78/+104
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Reset the GL stencil mask, op and function in resetGLState().Trond Kjernåsen2010-01-071-0/+3
| | | * | Fix performance regression in _q_polishItems.Alexis Menard2010-01-073-6/+29
| | | * | Fixed indentation and typo.Trond Kjernåsen2010-01-071-67/+67
| | | * | Fixed bug in boxes demo occuring with certain OpenGL drivers.Samuel Rødal2010-01-071-2/+4
| | | * | Remove unnecessary call to QWidget::setAttribute().Trond Kjernåsen2010-01-071-2/+0
| | | * | Avoid a deep copy of QImage::bits() in the png writerRhys Weatherley2010-01-061-1/+1
| | |/ /
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-0657-819/+1587
| | |\ \
| | | * | QBoxLayout::setGeometry would not respect the widget min/max widthGabriel de Dietrich2010-01-062-2/+31
| | | * | Revert "QStyleSheetStyle: Fixed some text croped when having padding with nat...Olivier Goffart2010-01-062-58/+1
| | | * | Use QFile:rename when moving items in QFileystemModel.Alexis Menard2010-01-061-2/+1
| | | * | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"Tom Cooksey2010-01-063-73/+3
| | | * | Fix default filter selection when using HideNameFilterDetails option.Alexis Menard2010-01-063-15/+70
| | | * | Don't write out fo:word-spacing if its the default value.Thomas Zander2010-01-061-2/+2
| | | * | Improved initial startup time for a QGLWidget ontop of EGL/X11.Trond Kjernåsen2010-01-061-5/+111
| | | * | Document the QGraphicsView::IndirectPainting flagOlivier Goffart2010-01-062-1/+11
| | | * | Display broken symlinks in the filesystem model.Alexis Menard2010-01-051-1/+1
| | | * | Merge branch 'QT-2261' into 4.6Jan-Arve Sæther2010-01-052-162/+224
| | | |\ \
| | | | * | Fixed a bug with distribution of spans.Jan-Arve Sæther2010-01-052-162/+224
| | | * | | Fix typo in autotest testcase name.Jan-Arve Sæther2010-01-051-2/+2
| | | * | | Make unit test more robustThomas Zander2010-01-051-1/+3
| | | * | | Compile with QT_NO_DOCKWIDGETOlivier Goffart2010-01-051-0/+2
| | | * | | Removed temporary QGLWidget created during QGLWidget/X11 initialization.Trond Kjernåsen2010-01-051-2/+67
| | | * | | Fix test: The bug is now fixedOlivier Goffart2010-01-051-1/+0
| | | * | | Fix auto-test failure on WindowsAlexis Menard2010-01-051-1/+0
| | | * | | QScript: Lookup the native setter from the prototypeOlivier Goffart2010-01-051-1/+9
| | | * | | Implement QScript::QObjectDelegate::getOwnPropertyDescriptorOlivier Goffart2010-01-054-1/+164
| | | * | | fix compilation in GL2 paint engine for WindowsGunnar Sletta2010-01-051-0/+1
| | | * | | Move QGLTextureGlyphCache into it's own fileTom Cooksey2010-01-055-240/+350
| | | * | | (mysql) Add test to the system so it's there for use later.Bill King2010-01-051-0/+38
| | | * | | (ODBC) Handle drivers that return SQL_NO_DATA for exec success.Bill King2010-01-051-1/+6
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-01-0485-824/+1772
| | | |\ \ \
| | | | * | | Remove QGLShareRegister and transfer its functionality to QGLContextGroupRhys Weatherley2010-01-0410-73/+40