Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 'on' syntax fixes | Yann Bodson | 2010-03-03 | 7 | -40/+40 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-03 | 1 | -0/+5 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-03 | 5 | -4/+9 |
| |\ | |||||
| * | | QDeclarativeGuard should handle objects being deleted | Aaron Kennedy | 2010-03-03 | 1 | -0/+5 |
* | | | Add documentation for the 'when' property of Binding. | Yann Bodson | 2010-03-03 | 1 | -1/+14 |
| |/ |/| | |||||
* | | Fix incorrect scope resolution for script in a script block. | Michael Brasser | 2010-03-03 | 1 | -0/+1 |
* | | Fix settings (was not exported type). | Warwick Allison | 2010-03-03 | 4 | -4/+8 |
|/ | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-03 | 1 | -7/+13 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-03 | 1 | -1/+1 |
| |\ | |||||
| * | | Fix mouse stealing in nested flickables. | Martin Jones | 2010-03-03 | 1 | -7/+13 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-03 | 89 | -1065/+1825 |
|\ \ \ | | |/ | |/| | |||||
| * | | Initialize variable before use. | Michael Brasser | 2010-03-02 | 1 | -1/+1 |
| |/ | |||||
| * | Fix build of imports | Tobias Hunger | 2010-03-02 | 24 | -74/+153 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-02 | 53 | -230/+752 |
| |\ | |||||
| | * | Compile fix on Windows | Alan Alpert | 2010-03-02 | 1 | -1/+1 |
| | * | Build fix on windows | Tobias Hunger | 2010-03-02 | 1 | -1/+1 |
| | * | Fix qml import modules loading on Windows | mae | 2010-03-02 | 1 | -8/+20 |
| | * | Moved qdeclarativemodules to imports | mae | 2010-03-02 | 18 | -31/+51 |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-02 | 39 | -192/+682 |
| | |\ | |||||
| | | * | Add "on" syntax to QmlChanges.txt | Aaron Kennedy | 2010-03-02 | 1 | -0/+10 |
| | | * | Don't return QDeclarativeDeclarativeData for a deleting object | Aaron Kennedy | 2010-03-02 | 2 | -2/+6 |
| | | * | Empty URL test | Aaron Kennedy | 2010-03-02 | 1 | -0/+7 |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-02 | 36 | -190/+659 |
| | | |\ | |||||
| | | | * | Merge branch 'master' into 4.7 | Warwick Allison | 2010-03-02 | 10 | -18/+97 |
| | | | |\ | |||||
| | | | | * | doc | Warwick Allison | 2010-03-02 | 1 | -0/+1 |
| | | | | * | Move WebView to an extension plugin. | Warwick Allison | 2010-03-02 | 8 | -18/+94 |
| | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-03-02 | 14 | -141/+325 |
| | | | | |\ | |||||
| | | | | | * | Add NOTIFY signals to list, grid and path views | Joona Petrell | 2010-03-02 | 8 | -36/+124 |
| | | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-03-01 | 2 | -4/+10 |
| | | | | |\ \ | |||||
| | | | | * | | | Export QDeclarativeWorkerScript and QDeclarativeWorkerListModel and | Bea Lam | 2010-03-01 | 1 | -2/+8 |
| | | | * | | | | Optimization. | Michael Brasser | 2010-03-02 | 1 | -2/+2 |
| | | | * | | | | Add NOTIFY signals to list, grid and path views | Joona Petrell | 2010-03-02 | 8 | -36/+124 |
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-02 | 20 | -134/+436 |
| | | | |\ \ \ \ | |||||
| * | | | | | | | | 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 |
| | |/ / / / / | |/| | | | | |