| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-03-03 | 3 | -7/+11 |
|\ |
|
| * | Fixed compiler warnings when compiling multimedia module. | Kurt Korbatits | 2010-03-03 | 3 | -7/+11 |
|
|
* | | Fix & move QEgl::native* to platform-specific files | Tom Cooksey | 2010-03-02 | 5 | -20/+49 |
|
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-02 | 25 | -656/+950 |
|\ \ |
|
| * | | Make bindTextureFromNativePixmap use new QEgl APIs | Tom Cooksey | 2010-03-02 | 6 | -20/+39 |
|
|
| * | | Move QGLWidget::setContext logic into QEgl & QGLContext | Tom Cooksey | 2010-03-02 | 6 | -131/+180 |
|
|
| * | | Move EGL surface type setting to new QEglProperties::setDeviceType | Tom Cooksey | 2010-03-02 | 8 | -41/+53 |
|
|
| * | | Replace qt_egl_add_platform_config with existing QEglProperties API | Tom Cooksey | 2010-03-02 | 4 | -35/+3 |
|
|
| * | | Use QEgl::display in QGLTemporaryContext so EGL is init'd only once | Tom Cooksey | 2010-03-02 | 1 | -6/+1 |
|
|
| * | | Remove qt_egl_setup_x11_visual | Tom Cooksey | 2010-03-02 | 1 | -149/+1 |
|
|
| * | | Make QGLWidget use new QEgl::getCompatibleVisualId API | Tom Cooksey | 2010-03-02 | 2 | -5/+18 |
|
|
| * | | Add QEglContext::configAttrib(int name) helper | Tom Cooksey | 2010-03-02 | 2 | -0/+11 |
|
|
| * | | Add getCompatibleVisualId to QEgl on X11 | Tom Cooksey | 2010-03-02 | 2 | -0/+149 |
|
|
| * | | Add QEgl::defaultConfig method to select configs suitable for Qt | Tom Cooksey | 2010-03-02 | 3 | -0/+188 |
|
|
| * | | Make QEgl::createSurface cross-platform and add native getters | Tom Cooksey | 2010-03-02 | 6 | -123/+57 |
|
|
| * | | Move chooseConfig and createSurface logic to QEgl functions | Tom Cooksey | 2010-03-02 | 6 | -12/+28 |
|
|
| * | | Move static methods from QEglContext to QEgl namespace | Tom Cooksey | 2010-03-02 | 10 | -88/+97 |
|
|
| * | | Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.h | Tom Cooksey | 2010-03-02 | 18 | -117/+196 |
|
|
* | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-03-02 | 2 | -2/+2 |
|
|
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-02 | 19 | -295/+418 |
|\ \ \
| |/ /
|/| | |
|
| * | | Merge remote branch 'staging/4.7' into HEAD | Aaron McCarthy | 2010-03-02 | 559 | -23288/+27523 |
| |\ \ |
|
| * | | | Bearer management changes from Qt Mobility (fca9891). | Aaron McCarthy | 2010-03-02 | 20 | -362/+482 |
|
|
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-01 | 4 | -32/+47 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-01 | 4 | -32/+47 |
| |\ \ \ |
|
| | * | | | removed dead code | Thierry Bastian | 2010-03-01 | 1 | -21/+12 |
|
|
| | * | | | QMetaObject::invokeMethod: print a warning if the method is not found. | Olivier Goffart | 2010-03-01 | 2 | -8/+25 |
|
|
| | * | | | Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X. | Trond Kjernåsen | 2010-03-01 | 1 | -3/+10 |
|
|
* | | | | | typo for windows ce exclusion rule | Maurice Kalinowski | 2010-03-01 | 1 | -1/+1 |
|
|
* | | | | | Perform latin1 conversion directly on JSC::UString | Kent Hansen | 2010-03-01 | 3 | -28/+46 |
|
|
* | | | | | Avoid conversion between JavaScriptCore String type and QString | Kent Hansen | 2010-03-01 | 4 | -18/+18 |
|
|
* | | | | | Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7. | Volker Hilsheimer | 2010-03-01 | 1 | -3/+5 |
|
|
* | | | | | Use QList::reserve() in QDataStream>>QList | Andreas Kling | 2010-03-01 | 1 | -0/+1 |
|
|
* | | | | | Added static method isValidColor to QColor. | Erik Verbruggen | 2010-03-01 | 2 | -3/+28 |
|
|
* | | | | | compile fix with namespaces | hjk | 2010-03-01 | 1 | -1/+2 |
|
|
* | | | | | qDetectCPUFeatures: compile fix with namespaces | hjk | 2010-03-01 | 1 | -2/+1 |
|
|
* | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47 | Maurice Kalinowski | 2010-03-01 | 1 | -3/+17 |
|\ \ \ \ \ |
|
| * | | | | | Mac: using Qt to write plugins disables quit for 3rd party application | Richard Moe Gustavsen | 2010-03-01 | 1 | -3/+17 |
| |/ / / / |
|
* | | | | | compile fix for WinCE | Maurice Kalinowski | 2010-03-01 | 1 | -0/+2 |
|/ / / / |
|
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-01 | 2 | -3/+4 |
|\ \ \ \ |
|
| * | | | | Fix building with Sun CC 5.10: missing :: for the QWeakPointer declaration | Thiago Macieira | 2010-03-01 | 1 | -2/+2 |
|
|
| * | | | | compile fix for WinCE | Maurice Kalinowski | 2010-03-01 | 1 | -1/+2 |
|
|
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-03-01 | 1 | -2/+19 |
|\ \ \ \ \ |
|
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-03-01 | 1 | -1/+1 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-03-01 | 203 | -2053/+4146 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Fix reload() when keys are not specified, and add extra tests. | Bea Lam | 2010-03-01 | 1 | -2/+19 |
|
|
* | | | | | | | | Small optimizations. | Martin Jones | 2010-03-01 | 2 | -4/+10 |
| |_|/ / / / /
|/| | | | | | |
|
* | | | | | | | Use setOpacity(0.) rather than setVisible() to avoid positioner relayout. | Martin Jones | 2010-03-01 | 1 | -1/+1 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-03-01 | 1 | -0/+2 |
|\ \ \ \ \ \ |
|
| * | | | | | | Fix IM repaint. | Warwick Allison | 2010-03-01 | 1 | -0/+2 |
|
|
* | | | | | | | Rename QDeclarativeGraphics_setParent_noEvent QDeclarative_setParent_noEvent | Martin Jones | 2010-03-01 | 6 | -12/+12 |
|/ / / / / / |
|