summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make the value of QMAKE_QMAKE somewhat less magicOswald Buddenhagen2010-03-021-1/+0
* Assistant: Don't warn for non-existing English to English translations.ck2010-03-021-1/+1
* Assistant: Un-watch files at shutdown.ck2010-03-021-0/+7
* Help system: Build search index with low priority.ck2010-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-0242-108/+611
|\
| * Fixed a regression in the syntax highlighterThorbjørn Lindeijer2010-03-021-0/+3
| * Merge remote branch 'staging/master' into 4.7Thiago Macieira2010-03-021-0/+2
| |\
| | * Fix compilation with namespace.ck2010-03-012-3/+4
| * | Add a template specialisation for QArgument when T is a reference.Thiago Macieira2010-03-021-0/+8
| * | Always run syncqt if using a Git checkout.Thiago Macieira2010-03-021-1/+1
| * | Added comment about usage of strncpy_s function in VC++ > 14.00Zeno Albisser2010-03-021-0/+4
| * | Compile.Morten Johan Sørvig2010-03-021-0/+1
| * | Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-0216-25/+57
| |\ \
| | * | compileHarald Fernengel2010-03-011-4/+4
| | * | Introduce optional qdoc_bootstrapped qmake flagHarald Fernengel2010-03-0115-21/+53
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-0221-78/+531
| |\ \ \
| | * | | QtDeclarative: Fix compiler warningsFriedemann Kleint2010-03-024-4/+2
| | * | | Implement alien widgets on Mac/Cocoa.Morten Johan Sørvig2010-03-029-29/+145
| | * | | QDeclarativeView: Add a Designer plugin.Friedemann Kleint2010-03-024-0/+220
| | * | | QDeclarativeView: Make usable in DesignerFriedemann Kleint2010-03-021-1/+3
| | * | | minor optimization: don't mark contents as dirty if nothing was changedRitt Konstantin2010-03-021-3/+9
| | * | | minor optimization: ignore invalid preeditAreaPosition/preeditAreaTextRitt Konstantin2010-03-021-17/+23
| | * | | remove unused codeRitt Konstantin2010-03-021-1/+0
| | * | | minor clean-ups and styling fixesRitt Konstantin2010-03-021-16/+12
| | * | | don't even try to rehighlight invalid or alien blockRitt Konstantin2010-03-021-1/+1
| | * | | don't cancel the scheduled complete rehighlight from rehighlightBlock()Ritt Konstantin2010-03-021-0/+5
| | * | | replace temporary disconnection with a very simple statemachineRitt Konstantin2010-03-021-6/+14
| | * | | Merge branch 'master-staging1' into 4.7-staging1Denis Dzyubenko2010-03-022-8/+105
| | |\ \ \
| | | * | | Extended gesture autotest.Denis Dzyubenko2010-03-012-1/+59
| | | | |/ | | | |/|
| | | * | Fixed coordinate system conversion for gestures.Denis Dzyubenko2010-03-012-7/+46
| * | | | OS X 10.4 compile error; required casting int to GLint.Martin Smith2010-03-021-4/+4
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0226-657/+986
|\ \ \ \
| * | | | Fix & move QEgl::native* to platform-specific filesTom Cooksey2010-03-025-20/+49
| * | | | Updates to changes fileaavit2010-03-021-0/+6
| * | | | 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
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-029-38/+81
|\ \ \ \ \ | | |/ / / | |/| | |