summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-031-0/+5
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-035-4/+9
| |\
| * | QDeclarativeGuard should handle objects being deletedAaron Kennedy2010-03-031-0/+5
* | | Add documentation for the 'when' property of Binding.Yann Bodson2010-03-031-1/+14
| |/ |/|
* | Fix incorrect scope resolution for script in a script block.Michael Brasser2010-03-031-0/+1
* | Fix settings (was not exported type).Warwick Allison2010-03-034-4/+8
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-031-7/+13
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-031-1/+1
| |\
| * | Fix mouse stealing in nested flickables.Martin Jones2010-03-031-7/+13
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0389-1065/+1825
|\ \ \ | | |/ | |/|
| * | Initialize variable before use.Michael Brasser2010-03-021-1/+1
| |/
| * Fix build of importsTobias Hunger2010-03-0224-74/+153
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0253-230/+752
| |\
| | * Compile fix on WindowsAlan Alpert2010-03-021-1/+1
| | * Build fix on windowsTobias Hunger2010-03-021-1/+1
| | * Fix qml import modules loading on Windowsmae2010-03-021-8/+20
| | * Moved qdeclarativemodules to importsmae2010-03-0218-31/+51
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0239-192/+682
| | |\
| | | * Add "on" syntax to QmlChanges.txtAaron Kennedy2010-03-021-0/+10
| | | * Don't return QDeclarativeDeclarativeData for a deleting objectAaron Kennedy2010-03-022-2/+6
| | | * Empty URL testAaron Kennedy2010-03-021-0/+7
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0236-190/+659
| | | |\
| | | | * Merge branch 'master' into 4.7Warwick Allison2010-03-0210-18/+97
| | | | |\
| | | | | * docWarwick Allison2010-03-021-0/+1
| | | | | * Move WebView to an extension plugin.Warwick Allison2010-03-028-18/+94
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-0214-141/+325
| | | | | |\
| | | | | | * Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-012-4/+10
| | | | | |\ \
| | | | | * | | Export QDeclarativeWorkerScript and QDeclarativeWorkerListModel andBea Lam2010-03-011-2/+8
| | | | * | | | Optimization.Michael Brasser2010-03-021-2/+2
| | | | * | | | Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0220-134/+436
| | | | |\ \ \ \
| * | | | | | | | Fix & move QEgl::native* to platform-specific filesTom Cooksey2010-03-025-20/+49
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0225-656/+950
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Make bindTextureFromNativePixmap use new QEgl APIsTom Cooksey2010-03-026-20/+39
| | * | | | | | | Move QGLWidget::setContext logic into QEgl & QGLContextTom Cooksey2010-03-026-131/+180
| | * | | | | | | Move EGL surface type setting to new QEglProperties::setDeviceTypeTom Cooksey2010-03-028-41/+53
| | * | | | | | | Replace qt_egl_add_platform_config with existing QEglProperties APITom Cooksey2010-03-024-35/+3
| | * | | | | | | Use QEgl::display in QGLTemporaryContext so EGL is init'd only onceTom Cooksey2010-03-021-6/+1
| | * | | | | | | Remove qt_egl_setup_x11_visualTom Cooksey2010-03-021-149/+1
| | * | | | | | | Make QGLWidget use new QEgl::getCompatibleVisualId APITom Cooksey2010-03-022-5/+18
| | * | | | | | | Add QEglContext::configAttrib(int name) helperTom Cooksey2010-03-022-0/+11
| | * | | | | | | Add getCompatibleVisualId to QEgl on X11Tom Cooksey2010-03-022-0/+149
| | * | | | | | | Add QEgl::defaultConfig method to select configs suitable for QtTom Cooksey2010-03-023-0/+188
| | * | | | | | | Make QEgl::createSurface cross-platform and add native gettersTom Cooksey2010-03-026-123/+57
| | * | | | | | | Move chooseConfig and createSurface logic to QEgl functionsTom Cooksey2010-03-026-12/+28
| | * | | | | | | Move static methods from QEglContext to QEgl namespaceTom Cooksey2010-03-0210-88/+97
| | * | | | | | | Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.hTom Cooksey2010-03-0218-117/+196
| | | |/ / / / / | | |/| | | | |
| * | | | | | | 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 4.7-integ...Qt Continuous Integration System2010-03-0219-295/+418
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |