summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cocoa: Fix misaligned text between format changesEskil Abrahamsen Blomfeldt2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | This reverts part of commit e008504b5ec34975e34adf3b1a2b7170d0e4dd38. The original commit aimed to round up all fractional numbers for the font to "improve appearance". Rounding up the last advance of a set of advances in a glyph layout, however, breaks text layout completely, since the layout of text will be different depending on how many text lines is used to represent it (since the last glyph in each line will have a higher advance than the others.) This was e.g. visible in Qt Creator when turning on whitespace visualization, as all spaces then created a format change, thus a new text line in the text layout, and hence an increase of X pixels in the positioning of the text after the space, where 0.0 < X < 1.0. I see no negative results of removing the rounding, but if there are any problems, it has to be fixed in the usage of the advances not in the advances themselves. Task-number: QTCREATORBUG-381, QTBUG-8791 Reviewed-by: mae
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-0529-195/+407
|\
| * Fixa few warnings on mingwThierry Bastian2010-03-052-1/+7
| |
| * QScript: Fix crash when converting a null value to a variant.Olivier Goffart2010-03-041-1/+3
| | | | | | | | | | | | Fixes test tst_QScriptValue::equals(engine->newVariant(QVariant(123)) <=> engine->newArray(10)) Reviewed-by: Jedrzej Nowacki
| * QPrinter: Add Current Page print range supportJohn Layt2010-03-049-139/+186
| | | | | | | | | | | | | | | | | | | | | | | | Support the selection of Current Page option in the print dialog by activating a new QPrintDialog::PrintDialogOption. If selected the PrintRange is set to CurrentPage. It is the responsibility of the application to read the PrintRange and apply the Current Page selection when rendering the pages. Merge-request: 2311 Reviewed-by: Trond
| * Fix build when egl.h includes X11 headers & pollutes namespaceTom Cooksey2010-03-042-7/+3
| | | | | | | | | | | | | | At some point we should fix the include order in all the .cpp files, however #udef'ing the defines we use elsewhere seems to work for now. Reviewed-By: TrustMe
| * Fix build on EGL implementations where EGLConfig is a pointerTom Cooksey2010-03-042-11/+13
| | | | | | | | | | | | | | EGLConfig is an opaque type which we really shouldn't cast to an int. Instead, we get the config id for the EGLConfig. Reviewed-By: TrustMe
| * Delay the resize section for better performance.Pierre Rossi2010-03-043-12/+5
| | | | | | | | | | | | | | | | This was particularly unusable when combining a QSortFilterProxyModel with resize mode ResizeToContents. Task-number: QTBUG-8540 Reviewed-by: Thierry
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0448-1271/+378
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Build fix for Sun Studio Finish to resolve merge conflict. Fixes QMenu to only have static POD members QScript: Test against QMetaType::QVariant instead of against the string Fixes tst_QScriptExtQObject::connectAndDisconnect Fix source compatibility of qRegisterMetaType Fix warnings on MSVC Updating documentation for how to build QWS with tslib sizeHint of checkbox/radiobutton without text is not correct Some cleanup of outdated src/3rdparty stuff Revert "Fixes crash when destroying a QGraphicsItem." Add config.test for multimedia/qml Fix QVariant autotest Fix compilation of Q_DECLARE_METATYPE(QVariant) by introducing QMetaType::QVariant fixed a memory leak when restoring a state in QMainWindow Make the sub-menu accessible via its shortcut even if it is the current remove a warning on windows and simplify a bit the code Add and use QGLContextPrivate::eglSurfaceForDevice() QMetaType: Now we can register typedefs.
| | * Build fix for Sun StudioThierry Bastian2010-03-041-2/+2
| | | | | | | | | | | | Task-number: QTBUG-8192
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-049-22/+188
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: WaveDecoder; be more permissive in handling of wave file formats. Debug media player status and media state changes. Added playlist playback modes combo box to player demo Added QMediaPlayer::StreamPlayback flag to query/select backend capable
| | * | WaveDecoder; be more permissive in handling of wave file formats.Justin McPherson2010-03-042-6/+16
| | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * | Debug media player status and media state changes.Dmytro Poplavskiy2010-03-041-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Disabled by default. Reviewed-by: Justin McPherson
| | * | Added playlist playback modes combo box to player demoDmytro Poplavskiy2010-03-042-1/+30
| | | | | | | | | | | | | | | | Reviewed-by: Justin McPherson
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-043-6/+6
| | |\ \
| | * | | Added QMediaPlayer::StreamPlayback flag to query/select backend capableDmytro Poplavskiy2010-03-045-14/+125
| | | | | | | | | | | | | | | | | | | | of playing from QIODevice based stream.
* | | | | Fixed failure to store certain image formats as jpegaavit2010-03-051-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In contrast to other image format handlers, the jpeg handler would not convert a QImage of an "unusual" format to a format it could handle when asked to write it. Now it does. Task-number: QTBUG-7780 Reviewed-by: Trond
* | | | | Added QImage::bitPlaneCount().aavit2010-03-042-5/+51
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the image format contains unused bits (e.g. Format_RGB32), depth() does not give the true number of bits of color information per pixel. This new function does. Task-number: QTBUG-7982 Reviewed-by: Trond
* | | | Finish to resolve merge conflict.Olivier Goffart2010-03-041-10/+11
| | | | | | | | | | | | | | | | | | | | Move the change that were made in commit 9957e85e37345e946ecc67196d65fbca867a2001 from src/multimedia/qml/qml.pri to src/multimedia/effects/effects.pri
* | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-0434-213/+107
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: src/multimedia/qml/qml.pri
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-0434-211/+107
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix namespace qml decleration. Cocoa namespace fixes. Namespace fixes. QT7 mediaservice; Fix memory leak Undo a doc revert. Remove dependency on declarative from multimedia.
| | * | Fix namespace qml decleration.Justin McPherson2010-03-041-2/+1
| | | | | | | | | | | | | | | | Reviewed-by: Andrew den Exter
| | * | Cocoa namespace fixes.Justin McPherson2010-03-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Rohan McGovern
| | * | Namespace fixes.Justin McPherson2010-03-041-3/+4
| | |/ | | | | | | | | | Reviewed-by: Rohan McGovern
| | * QT7 mediaservice; Fix memory leakJustin McPherson2010-03-031-0/+1
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * Undo a doc revert.Justin McPherson2010-03-031-1/+1
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * Remove dependency on declarative from multimedia.Justin McPherson2010-03-0330-206/+101
| | | | | | | | | | | | | | | | | | Move all declarative related classes into the multimedia declarative module. Reviewed-by: Andrew den Exter
* | | Fixes QMenu to only have static POD membersThierry Bastian2010-03-042-15/+15
| | | | | | | | | | | | This also fixes the autotests
* | | QScript: Test against QMetaType::QVariant instead of against the stringOlivier Goffart2010-03-042-28/+20
| | | | | | | | | | | | | | | | | | | | | now that QVariant is known to QMetaType, we can test for the metatype id instead of doing string comparison Reviewed-by: Kent Hansen
* | | Fixes tst_QScriptExtQObject::connectAndDisconnectOlivier Goffart2010-03-041-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that QVariant is known to QMetaType, it has an ID. This is much more robust as before. This would have fail if QVariant, would have been registered by the user. Reviewed-by: Kent Hansen
* | | Fix source compatibility of qRegisterMetaTypeOlivier Goffart2010-03-031-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveQt is having construct like qRegisterMetaType("Foo*", (Foo*)0 ); instead of qRegisterMetaType<Foo *>("Foo*"); Which the compiler could not disambiguate anymore since commit 03daf059647c0a0222e8774b0a083f58c8e64934 Reviewed-by: Thierry
* | | Fix warnings on MSVCThierry Bastian2010-03-034-4/+5
| | |
* | | Updating documentation for how to build QWS with tslibJørgen Lind2010-03-032-4/+7
| | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
* | | sizeHint of checkbox/radiobutton without text is not correctThierry Bastian2010-03-033-3/+3
| | | | | | | | | | | | Reviewed-by: Jens Bache-Wiig
* | | Some cleanup of outdated src/3rdparty stuffaavit2010-03-0313-1106/+15
| | | | | | | | | | | | Reviewed-by: trustme
* | | Revert "Fixes crash when destroying a QGraphicsItem."Yoann Lopes2010-03-032-60/+2
| | | | | | | | | | | | | | | | | | The patch was wrong. The new one is pushed into 4.6. The old one is reverted to avoid merge conflicts. This reverts commit a7ef2d899d711d750238a8d69284da808188b407.
* | | Add config.test for multimedia/qmlJørgen Lind2010-03-034-9/+79
| | | | | | | | | | | | | | | | | | using pkg-config from pri file is not good for cross-compiling Reviewed-by: paul
* | | Fix QVariant autotestOlivier Goffart2010-03-031-3/+11
| | | | | | | | | | | | | | | | | | | | | After 03daf059647c0a0222e8774b0a083f58c8e64934, typedef of int are just aliases to int, and therefor we need to use a real custom type for the test now Reviewed-by: Thierry
* | | Fix compilation of Q_DECLARE_METATYPE(QVariant) by introducing ↵Olivier Goffart2010-03-033-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMetaType::QVariant After 03daf059647c0a0222e8774b0a083f58c8e64934 With the recent change in QMetaType, qRegisterMetaType<T> instantiates QMetaTypeId2<T>, which itself instantiates QMetaTypeId<T> if T is not builtin into QMetaType. But qRegisterMetaType<QVariant> is called in qvariant.h which makes further call to Q_DECLARE_METATYPE(QVariant) to fail as QMetaTypeId<QVariant> would have been instantied before The solution is to make QVariant a builtin type. Reviewed-by: Thierry
* | | fixed a memory leak when restoring a state in QMainWindowThierry Bastian2010-03-031-1/+4
| | | | | | | | | | | | Task-number: QTBUG-8631
* | | Make the sub-menu accessible via its shortcut even if it is the currentThierry Bastian2010-03-032-10/+22
| | | | | | | | | | | | | | | Task-number: QTBUG-7411 Reviewed-by: ogoffart
* | | remove a warning on windows and simplify a bit the codeThierry Bastian2010-03-031-5/+2
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0310-10/+179
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add and use QGLContextPrivate::eglSurfaceForDevice() QMetaType: Now we can register typedefs.
| * | Add and use QGLContextPrivate::eglSurfaceForDevice()Tom Cooksey2010-03-024-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | The QGLContext only stores the EGLSurface for QWidgets & QGLWidgets, other device types like QPixmap & QGLPixelBuffer store the surface themsselves. With this patch it is possible to create a QGLContext on a QPixmap, make it current and render GL to that QPixmap on X11. Reviewed-By: TrustMe
| * | QMetaType: Now we can register typedefs.Olivier Goffart2010-03-026-6/+146
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6833 Task-number: QTBUG-937 Reviewed-by: Brad Reviewed-by: Kent Hansen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-039-74/+230
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compile of some tests with `-qtnamespace' Gstreamer media backend: ensure the null video output is not deleted Use mute property instead of setting volume to 0 if playbin2 is used. Gstreamer playback backend: Start loading media on setMedia(), Fixed compiler warnings when compiling multimedia module.
| * | Fixed compile of some tests with `-qtnamespace'Rohan McGovern2010-03-032-0/+11
| | |
| * | Gstreamer media backend: ensure the null video output is not deletedDmytro Poplavskiy2010-03-031-0/+2
| | | | | | | | | | | | | | | | | | during player session lifetime Reviewed-by: Andrew den Exter
| * | Use mute property instead of setting volume to 0 if playbin2 is used.Dmytro Poplavskiy2010-03-031-8/+20
| | | | | | | | | | | | | | | Task-number: QTMOBILITY-67 Reviewed-by: Andrew den Exter
| * | Gstreamer playback backend: Start loading media on setMedia(),Dmytro Poplavskiy2010-03-034-59/+186
| | | | | | | | | | | | | | | | | | | | | | | | without waiting for play() or pause(). To keep behaviour consisten with the rest of backends. Reviewed-by: Andrew den Exter
generated by cgit v0.12 at 2025-08-25 16:59:09 (GMT)