summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QStyleSheetStyle: Fixed some text croped when having padding with native border.Olivier Goffart2010-01-082-1/+58
| | | | | | | | The native border width need to be taken into account in QRenderRule::boxRect() Task-number: QTBUG-6855 Reviewed-by: Benjamin Poulain (cherry picked from commit 6e90192b599cee9b903177a0978198326f667613)
* Merge remote branch 'origin/master'Olivier Goffart2010-01-08451-5848/+18836
|\
| * Merge branch '4.6'Thiago Macieira2010-01-08150-1477/+5145
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-0825-124/+186
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: QAudioInput loses data on Maemo5/other linux platforms. Fix warning in qfilesystemmodel_p.h Frequency to SampleRate and channels to channelCount. Added setChannelCount() to QAudioFormat.
| | | * 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
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/multimedia/audiodevices/audiodevices.cpp
| | | | * | Fix warning in qfilesystemmodel_p.hJustin McPherson2010-01-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Rhys Weatherley
| | | * | | QAudioInput loses data on Maemo5/other linux platforms.Kurt Korbatits2010-01-071-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The alsa backend was calculating sample timer on resume using buffer_time instead of period_time. Task-number:QTBUG-7044 Reviewed-by:Justin McPherson
| | | * | Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-0624-90/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Added channelCount(), changed everything to use this instead of channels() in QAudioFormat class. -Added setSampleRate() and sampleRate(), changed everthing to use these instead of setFrequency() and frequency() in QAudioFormat class. -Added supportedSampleRates() and supportedChannelCounts(), changed everything to use these instead of supportedFrequencies() and supportedChannels() in QAudioDeviceInfo class. Reviewed-by:Justin McPherson
| | | * | Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-0616-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added setChannelCount() and updated docs/examples/tests to use it instead of setChannels(). Reviewed-by:Justin McPherson
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-078-78/+104
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Reset the GL stencil mask, op and function in resetGLState(). Fix performance regression in _q_polishItems. Fixed indentation and typo. Fixed bug in boxes demo occuring with certain OpenGL drivers. Remove unnecessary call to QWidget::setAttribute(). Avoid a deep copy of QImage::bits() in the png writer
| | | * | Reset the GL stencil mask, op and function in resetGLState().Trond Kjernåsen2010-01-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7203 Reviewed-by: Samuel
| | | * | Fix performance regression in _q_polishItems.Alexis Menard2010-01-073-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSet is a hash internally, using Iterator::begin while erasing elements inside the set might create holes and then the complexity increase. We now use the return value of erase (the next element) so the complexity is linear. For those who create/delete item in the polish event (BAD), _q_polishItem might be slower than the normal call. Task-number:QTBUG-6958 Reviewed-by:olivier
| | | * | Fixed indentation and typo.Trond Kjernåsen2010-01-071-67/+67
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | Fixed bug in boxes demo occuring with certain OpenGL drivers.Samuel Rødal2010-01-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently glLoadMatrixf doesn't load the supplied data synchronously in certain drivers, so we make the arrays static to work around this issue. Really a GL driver bug but it's quite simple to work around it in this case. Reviewed-by: Kim
| | | * | Remove unnecessary call to QWidget::setAttribute().Trond Kjernåsen2010-01-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already done in the QGLWidget constructor. Reviewed-by: Kim
| | | * | Avoid a deep copy of QImage::bits() in the png writerRhys Weatherley2010-01-061-1/+1
| | |/ / | | | | | | | | | | | | | | | | Task-number: QTBUG-7161 Reviewed-by: Daniel Pope
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-0657-819/+1587
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits) QBoxLayout::setGeometry would not respect the widget min/max width Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border." Use QFile:rename when moving items in QFileystemModel. Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram" Fix default filter selection when using HideNameFilterDetails option. Don't write out fo:word-spacing if its the default value. Improved initial startup time for a QGLWidget ontop of EGL/X11. Document the QGraphicsView::IndirectPainting flag Display broken symlinks in the filesystem model. Fix typo in autotest testcase name. Fixed a bug with distribution of spans. Make unit test more robust Compile with QT_NO_DOCKWIDGET Removed temporary QGLWidget created during QGLWidget/X11 initialization. Fix test: The bug is now fixed Fix auto-test failure on Windows QScript: Lookup the native setter from the prototype Implement QScript::QObjectDelegate::getOwnPropertyDescriptor fix compilation in GL2 paint engine for Windows Move QGLTextureGlyphCache into it's own file ...
| | | * | QBoxLayout::setGeometry would not respect the widget min/max widthGabriel de Dietrich2010-01-062-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling heightforWidth after a geometry change, the width actually used could be outside the widget's width bounds. The height could then be smaller than needed to fit the widget's contents resulting in a clipped widget being drawn. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-7103
| | | * | Revert "QStyleSheetStyle: Fixed some text croped when having padding with ↵Olivier Goffart2010-01-062-58/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native border." This reverts commit 6e90192b599cee9b903177a0978198326f667613. his change the behaviour a little bit. It is better to wait for Qt 4.7 Reviewed-by: jbache
| | | * | Use QFile:rename when moving items in QFileystemModel.Alexis Menard2010-01-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We got for free the recursive move if the directory that we move has subdirectories. Unfortunately copying a directory to an another is not easy in Qt so the copy still doesn't work if the directory contains directories. Task-number:QTBUG-5855 Reviewed-by:ogoffart
| | | * | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"Tom Cooksey2010-01-063-73/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't add new public methods in patch releases. This reverts commit 2b4d3391fd922dfc5ac28815bbd5f36c4041b658. This patch also fixes the paint engine to use glUniformMatrix3fv directly now it has been removed from 4.6. It is a 3 line change. Reviewed-By: Samuel
| | | * | Fix default filter selection when using HideNameFilterDetails option.Alexis Menard2010-01-063-15/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you have HideNameFilterDetails on, comparing the default filter given in parameter for selectNameFilter has to be done with the striped version of the filter, i.e. without the details. Task-number:QTBUG-4842 Reviewed-by:gabriel Reviewed-by:olivier
| | | * | Don't write out fo:word-spacing if its the default value.Thomas Zander2010-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the property fo:word-spacing is still not in an official ODF spec so a strict schema check will fail in any doc that uses it. Lets make sure we limit the writing of that property to only those usecases where the property was really set by the user. Task-number: QTBUG-5725
| | | * | Improved initial startup time for a QGLWidget ontop of EGL/X11.Trond Kjernåsen2010-01-061-5/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exchanged the temporary QGLWidget with a lightweight internal class. Measured on a device it can be upto 20 ms faster to construct. Reviewed-by: Tom Cooksey
| | | * | Document the QGraphicsView::IndirectPainting flagOlivier Goffart2010-01-062-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And that the QGraphics{View,Scene}::drawItems function are now obsolete. Reviewed-by: Alexis
| | | * | Display broken symlinks in the filesystem model.Alexis Menard2010-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A broken symlink has a -1 size so we need to special case that. Task-number:QTBUG-7119 Reviewed-by:olivier
| | | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a span required more size than the rows/columns it spanned, the size of the span was not distributed to the rows it spanned. The result was that the size hints of the layout was not correct, causing the layout to be potentially smaller than the spanning item. Task: QT-2261 Reviewed-by: Alexis
| | | * | | Fix typo in autotest testcase name.Jan-Arve Sæther2010-01-051-2/+2
| | | | | |
| | | * | | Make unit test more robustThomas Zander2010-01-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that on systems that have a default font of "Sans Serif" (or another not really existing font name) the unit test doesn't fail. Reviewed-By: Simon Hausmann Reviewed-By: Olivier
| | | * | | Compile with QT_NO_DOCKWIDGETOlivier Goffart2010-01-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7133
| | | * | | Removed temporary QGLWidget created during QGLWidget/X11 initialization.Trond Kjernåsen2010-01-051-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..and replace it with a much lighter, internal QGLTempContext. Reviewed-by: Samuel
| | | * | | Fix test: The bug is now fixedOlivier Goffart2010-01-051-1/+0
| | | | | |
| | | * | | Fix auto-test failure on WindowsAlexis Menard2010-01-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | | * | | QScript: Lookup the native setter from the prototypeOlivier Goffart2010-01-051-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usefull if we have 'native' properties with setter in a prototype This happen if you use a QObject wrapper as a prototype. Use getPropertyDescriptor that look up the prototype in order to know if we have a setter. Note that we cannot relly on PropertDescriptor::isAccessorDescriptor as the Getter or Setter attributes are not necesserly updated correctly when updating properties. (See the workaround QScriptValuePrivate::propertyFlags, and tst_QScriptValue::getSetProperty with object7) Task-number: QTBUG-5749 (also need the previous patch) Reviewed-by: Kent Hansen
| | | * | | Implement QScript::QObjectDelegate::getOwnPropertyDescriptorOlivier Goffart2010-01-054-1/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for the fix for QTBUG-5749 that follow Reviewed-by: Kent Hansen Task-number: QTBUG-5749
| | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Samuel
| | | * | | (mysql) Add test to the system so it's there for use later.Bill King2010-01-051-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test passes/doesn't fail, but is a useful test nonetheless, so adding it to the testsystem anyway. Task-number: QTBUG-6852
| | | * | | (ODBC) Handle drivers that return SQL_NO_DATA for exec success.Bill King2010-01-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most drivers return SQL_SUCCESS when executing a delete statement for example, but FreeTDS returns SQL_NO_DATA, which is technically correct, but doesn't follow the practice of other drivers. Task-number: QTBUG-4896 Reviewed-by: Justin McPherson
| | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2600 Reviewed-by: Samuel
| | | | * | | BitsPerSample should default to 1 in TIFF files.Rhys Weatherley2010-01-041-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6870 Reviewed-by: Lorn Potter
| | | | * | | Make the ShowDirsOnly option work in QFileDialog.Alexis Menard2010-01-042-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option was simply not implemented at all so it didn't work. Task-number:QTBUG-6558 Reviewed-by:ogoffart
| | | | * | | Slight performance improvement in comp_func_SourceOver.Samuel Rødal2010-01-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should check for the fully opaque and fully transparent special cases, like we do in the dedicated image blend functions. Reveiewed-by: Gunnar Sletta
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-042-5/+44
| | | | |\ \ \
| | | | | * | | Introduce new "snapToPixelGrid" flag to GL2 engine for drawTextTom Cooksey2010-01-042-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we're rendering text, the glyphs need to be aligned to the pixel grid otherwise we get strange artifacts. Normally text is drawn at integer coordinates, however it is still possible to have a transform which translates by a non-integer offset. This patch adds a flag to the engine which can be used to snap any translate to the pixel grid. Task-number: QTBUG-7094 Reviewed-By: Kim
| | | | * | | | fixed typo in qpainter docsGunnar Sletta2010-01-041-1/+1
| | | | |/ / /
| | | | * | | Make stretchblit an opt-out option in DirectFBAnders Bakken2010-01-043-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain boards are not support StretchBlit very well. This patch enables them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster engine for stretchblits. Reviewed-by: Donald Carr <donald.carr@nokia.com>
generated by cgit v0.12 at 2024-09-20 16:28:16 (GMT)