summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-033-7/+11
|\
| * Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-033-7/+11
* | 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
|\ \ \ | |/ / |/| |
| * | Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-02559-23288/+27523
| |\ \
| * | | Bearer management changes from Qt Mobility (fca9891).Aaron McCarthy2010-03-0220-362/+482
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-014-32/+47
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-014-32/+47
| |\ \ \
| | * | | removed dead codeThierry Bastian2010-03-011-21/+12
| | * | | QMetaObject::invokeMethod: print a warning if the method is not found.Olivier Goffart2010-03-012-8/+25
| | * | | Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.Trond Kjernåsen2010-03-011-3/+10
* | | | | typo for windows ce exclusion ruleMaurice Kalinowski2010-03-011-1/+1
* | | | | Perform latin1 conversion directly on JSC::UStringKent Hansen2010-03-013-28/+46
* | | | | Avoid conversion between JavaScriptCore String type and QStringKent Hansen2010-03-014-18/+18
* | | | | 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
* | | | | Added static method isValidColor to QColor.Erik Verbruggen2010-03-012-3/+28
* | | | | compile fix with namespaceshjk2010-03-011-1/+2
* | | | | qDetectCPUFeatures: compile fix with namespaceshjk2010-03-011-2/+1
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-011-3/+17
|\ \ \ \ \
| * | | | | Mac: using Qt to write plugins disables quit for 3rd party applicationRichard Moe Gustavsen2010-03-011-3/+17
| |/ / / /
* | | | | compile fix for WinCEMaurice Kalinowski2010-03-011-0/+2
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-012-3/+4
|\ \ \ \
| * | | | Fix building with Sun CC 5.10: missing :: for the QWeakPointer declarationThiago Macieira2010-03-011-2/+2
| * | | | compile fix for WinCEMaurice Kalinowski2010-03-011-1/+2
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-011-2/+19
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-011-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-01203-2053/+4146
| |\ \ \ \ \ \
| * | | | | | | Fix reload() when keys are not specified, and add extra tests.Bea Lam2010-03-011-2/+19
* | | | | | | | Small optimizations.Martin Jones2010-03-012-4/+10
| |_|/ / / / / |/| | | | | |
* | | | | | | Use setOpacity(0.) rather than setVisible() to avoid positioner relayout.Martin Jones2010-03-011-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-011-0/+2
|\ \ \ \ \ \
| * | | | | | Fix IM repaint.Warwick Allison2010-03-011-0/+2
* | | | | | | Rename QDeclarativeGraphics_setParent_noEvent QDeclarative_setParent_noEventMartin Jones2010-03-016-12/+12
|/ / / / / /