summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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
| * | Make QEgl::createSurface cross-platform and add native gettersTom Cooksey2010-03-026-123/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEgl::createSurface was virtually identical for every platform apart from the line which returned the native window type. This patch just adds QEgl::nativePixmap and QEgl::nativeWindow which are platform specific (though the default widget->winId() works for everything apart from symbian). Reviewed-By: Aleksandar Sasha Babic
| * | Move chooseConfig and createSurface logic to QEgl functionsTom Cooksey2010-03-026-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | We keep the methods in QEglContext, but these are useful helpers which wrap the QEgl version of the functions, which is where the bulk of the logic is (for these functions anyway). Reviewed-By: Aleksandar Sasha Babic
| * | Move static methods from QEglContext to QEgl namespaceTom Cooksey2010-03-0210-88/+97
| | | | | | | | | | | | Reviewed-By: Aleksandar Sasha Babic
| * | Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.hTom Cooksey2010-03-0218-117/+196
| | | | | | | | | | | | | | | | | | | | | | | | This puts the QEgl namespace in a single file which can be used by both qeglcontext and qeglproperties. Files which need QEglContext should now include qeglcontext_p.h. Reviewed-By: Aleksandar Sasha Babic
* | | doc: Fixed some qdoc errors.Martin Smith2010-03-022-2/+2
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0219-295/+418
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management changes from Qt Mobility (fca9891).
| * | Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-02559-23288/+27523
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/corewlan/qcorewlanengine.mm
| * | | Bearer management changes from Qt Mobility (fca9891).Aaron McCarthy2010-03-0220-362/+482
| | | | | | | | | | | | | | | | fca98911b75ce12e70d93cfc2932a9759758a605
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-014-32/+47
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: removed dead code QMetaObject::invokeMethod: print a warning if the method is not found. Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-014-32/+47
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: removed dead code QMetaObject::invokeMethod: print a warning if the method is not found. Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
| | * | | removed dead codeThierry Bastian2010-03-011-21/+12
| | | | | | | | | | | | | | | | | | | | Reviewed-by: denis
| | * | | QMetaObject::invokeMethod: print a warning if the method is not found.Olivier Goffart2010-03-012-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adapt QTestLib not to call invokeMethod on unexisting method to avoid warnings Task-number: QTBUG-7331 Reviewed-by: Brad
| | * | | Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.Trond Kjernåsen2010-03-011-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the 4.7 port of d04f5336f769d9e5d2f9105e1da4a7d23ea91795. Task-number: related to QTBUG-8455 Reviewed-by: Kim
* | | | | typo for windows ce exclusion ruleMaurice Kalinowski2010-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
* | | | | Perform latin1 conversion directly on JSC::UStringKent Hansen2010-03-013-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This conversion needs to be as fast as possible since it's performed every time you access a QObject property from QtScript. Hence, we should avoid going via QString and instead do the conversion ourselves. Reviewed-by: Jedrzej Nowacki
* | | | | Avoid conversion between JavaScriptCore String type and QStringKent Hansen2010-03-014-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use JSC::UString internally. Only when the public API demands it should a JSC::UString be converted to a QString. Reviewed-by: Jedrzej Nowacki
* | | | | Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.Volker Hilsheimer2010-03-011-3/+5
| | | | |
* | | | | Use QList::reserve() in QDataStream>>QListAndreas Kling2010-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
* | | | | Added static method isValidColor to QColor.Erik Verbruggen2010-03-012-3/+28
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta
* | | | | compile fix with namespaceshjk2010-03-011-1/+2
| | | | |
* | | | | qDetectCPUFeatures: compile fix with namespaceshjk2010-03-011-2/+1
| | | | |
generated by cgit v0.12 at 2024-12-04 20:04:50 (GMT)