summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-0436-1205/+219
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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-0430-209/+83
| |\ | | | | | | | | | | | | Conflicts: src/multimedia/qml/qml.pri
| * | 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
| | |
| * | 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-031-3/+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-031-9/+11
| | | | | | | | | | | | | | | | | | using pkg-config from pri file is not good for cross-compiling Reviewed-by: paul
| * | 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-031-10/+2
| | | | | | | | | | | | | | | 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-036-8/+126
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-4/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6833 Task-number: QTBUG-937 Reviewed-by: Brad Reviewed-by: Kent Hansen
* | | | 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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-043-6/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | | | Added QMediaPlayer::StreamPlayback flag to query/select backend capableDmytro Poplavskiy2010-03-044-14/+53
|/ / / | | | | | | | | | of playing from QIODevice based stream.
* | | 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-0326-202/+77
|/ / | | | | | | | | | | Move all declarative related classes into the multimedia declarative module. Reviewed-by: Andrew den Exter
* | 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-033-7/+11
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compiler warnings when compiling multimedia module.
| * Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-033-7/+11
| | | | | | | | Reviewed-by:Andrew den Exter
* | Fix & move QEgl::native* to platform-specific filesTom Cooksey2010-03-025-20/+49
| | | | | | | | | | | | This should fix build on Symbian & WinCE Reviewed-By: TrustMe
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0225-656/+950
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make bindTextureFromNativePixmap use new QEgl APIs Move QGLWidget::setContext logic into QEgl & QGLContext Move EGL surface type setting to new QEglProperties::setDeviceType Replace qt_egl_add_platform_config with existing QEglProperties API Use QEgl::display in QGLTemporaryContext so EGL is init'd only once Remove qt_egl_setup_x11_visual Make QGLWidget use new QEgl::getCompatibleVisualId API Add QEglContext::configAttrib(int name) helper Add getCompatibleVisualId to QEgl on X11 Add QEgl::defaultConfig method to select configs suitable for Qt Make QEgl::createSurface cross-platform and add native getters Move chooseConfig and createSurface logic to QEgl functions Move static methods from QEglContext to QEgl namespace Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.h
| * | Make bindTextureFromNativePixmap use new QEgl APIsTom Cooksey2010-03-026-20/+39
| | | | | | | | | | | | | | | | | | | | | The old qt_chooseEGLConfigForPixmap & qt_createEGLSurfaceForPixmap code will remain until QX11GLPixmapData can be re-written properly. Reviewed-By: TrustMe
| * | Move QGLWidget::setContext logic into QEgl & QGLContextTom Cooksey2010-03-026-131/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEgl::createSurface() on X11 will now check to see if the device's X11 Visual is compatible with the EGLConfig passed in. If it is not compatible, the function will re-create the QPaintDevice's native drawable with a different Visual (one which is compatable with the EGLConfig). This represented the bulk of the QGLWidget::setContext method which is now much simpler. As a consequense of this change, QWidgets with graphicssystem opengl will behave much more like QGLWidget as most of the code is re-used. So things like WA_TranslucentBackground should now work with opengl graphicssystem too. Reviewed-By: TrustMe
| * | Move EGL surface type setting to new QEglProperties::setDeviceTypeTom Cooksey2010-03-028-41/+53
| | | | | | | | | | | | | | | | | | Also renamed qt_egl_set_format->qt_eglproperties_set_glformat Reviewed-By: TrustMe
| * | Replace qt_egl_add_platform_config with existing QEglProperties APITom Cooksey2010-03-024-35/+3
| | | | | | | | | | | | | | | | | | | | | QEglProperties::setPaintDeviceFormat() seems to be a copy & paste of qt_egl_add_platform_config for every platform anyway. Reviewed-By: TrustMe
| * | Use QEgl::display in QGLTemporaryContext so EGL is init'd only onceTom Cooksey2010-03-021-6/+1
| | | | | | | | | | | | Reviewed-By: Trond Kjernåsen
| * | Remove qt_egl_setup_x11_visualTom Cooksey2010-03-021-149/+1
| | | | | | | | | | | | | | | | | | | | | This method has been re-written as QEgl::getCompatibleVisualId() which is much cleaner code. Reviewed-By: TrustMe
| * | Make QGLWidget use new QEgl::getCompatibleVisualId APITom Cooksey2010-03-022-5/+18
| | | | | | | | | | | | Reviewed-By: TrustMe
| * | Add QEglContext::configAttrib(int name) helperTom Cooksey2010-03-022-0/+11
| | | | | | | | | | | | Reviewed-By: TrustMe
| * | Add getCompatibleVisualId to QEgl on X11Tom Cooksey2010-03-022-0/+149
| | | | | | | | | | | | | | | | | | | | | | | | This method takes an EGLConfig and hands back an X11 VisualID which can be used to create native windows/pixmaps which will have an EGL surface created for them using the given EGL config. Reviewed-By: TrustMe
| * | Add QEgl::defaultConfig method to select configs suitable for QtTom Cooksey2010-03-023-0/+188
| | | | | | | | | | | | Reviewed-By: TrustMe
generated by cgit v0.12 at 2024-10-24 15:24:32 (GMT)