summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111249-26175/+49551
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-102-0/+120
| |\
| | * Update def files for latest QtDeclarative APIShane Kearns2010-03-102-0/+120
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-109-50/+97
| |\ \
| | * | MAke the SIMD fiunctions be used even when the QT_NO_DEBUG macro is usedThierry Bastian2010-03-101-3/+0
| | * | Make sure 16-bit EGL configs are chosen over 32-bit configsTom Cooksey2010-03-102-32/+55
| | * | Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATICTom Cooksey2010-03-101-3/+13
| | * | Handle EGLSurfaces better, including more error detectionTom Cooksey2010-03-106-10/+21
| | * | Make sure pixmap hooks get installed so EGL surfaces are cleaned upTom Cooksey2010-03-101-0/+4
| | * | Don't show resize cursor for fixed-size windowsPaul Olav Tvete2010-03-101-2/+4
| * | | Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4....Qt Continuous Integration System2010-03-10117-3360/+4262
| |\ \ \
| | * | | Don't wait forever when scanning for wifi networks on win32 fails.Aaron McCarthy2010-03-101-3/+20
| | * | | Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4....Qt Continuous Integration System2010-03-09117-3357/+4242
| | |\ \ \
| | | * | | Revert 12b6987031be9faee3886d7623888feb4e1762afMorten Johan Sørvig2010-03-091-7/+0
| | | * | | Changed TEST_COMPILER from CC to CXX in configure script.Zeno Albisser2010-03-091-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-09118-3356/+4248
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-095-8/+152
| | | | |\ \ \
| | | | | * | | Carbon: Native filedialog does not apply filters on app-bundlesRichard Moe Gustavsen2010-03-091-4/+13
| | | | | * | | Cocoa: Native filedialog does not apply filters on app-bundlesRichard Moe Gustavsen2010-03-091-3/+7
| | | | | * | | Improve performance of QTimer::singleShotMarkus Goetz2010-03-092-1/+25
| | | | | * | | Add a benchmark comparing single shot timer with invokeMethodMarkus Goetz2010-03-092-0/+107
| | | | * | | | doc: Fixed several qdoc errors.Martin Smith2010-03-0917-60/+54
| | | | |/ / /
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-09102-3301/+4055
| | | | |\ \ \
| | | | | * | | use Qt's private mac functions, reduce code redundancyLorn Potter2010-03-091-43/+13
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-08102-3267/+4051
| | | | | |\ \ \
| | | | | | * \ \ Merge remote branch 'origin/4.7' into 4.7Thiago Macieira2010-03-0815-475/+211
| | | | | | |\ \ \
| | | | | | * | | | Assistant: Fix compile warning for empty header.ck2010-03-086-29/+17
| | | | | | * | | | Doc: mark QEasingCurve support functions as new in 4.7.Volker Hilsheimer2010-03-081-0/+2
| | | | | | * | | | Modify the XML test suite not to use non-characters.Thiago Macieira2010-03-085-5/+5
| | | | | | * | | | Autotest: Fix failing QTextCodec testsThiago Macieira2010-03-082-8/+10
| | | | | | * | | | Doc: mark methods as internal (as they were in previous releases)Volker Hilsheimer2010-03-081-0/+10
| | | | | | * | | | Doc: add image for Qt Quick to "What's New" page.Volker Hilsheimer2010-03-082-0/+2
| | | | | | * | | | qdoc: Clear a static multimap after each qdocconf file.Martin Smith2010-03-083-0/+11
| | | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-08160-3075/+4266
| | | | | | |\ \ \ \
| | | | | | | * | | | Fixed mouse wheel handling in scrollareas.Denis Dzyubenko2010-03-081-0/+1
| | | | | | | * | | | Added two missing keys for X11Denis Dzyubenko2010-03-083-0/+7
| | | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0880-3224/+3985
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Carbon: usage of menu bars can cause exceptions to be thrownRichard Moe Gustavsen2010-03-081-1/+1
| | | | | | * | | | | | qdoc: Added some debug output to track down a crashMartin Smith2010-03-081-2/+2
| | | | | | | |/ / / / | | | | | | |/| | | |
| | | | | | * | | | | Mac: compile fixRichard Moe Gustavsen2010-03-081-1/+2
| | | | | | * | | | | Fix buildHarald Fernengel2010-03-081-1/+1
| | | | | | * | | | | JPEG plugin: Use switch() instead of if()Markus Goetz2010-03-081-11/+22
| | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-07170-2570/+5044
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Avoid conversion to/from QChar in the cn codec to unicodeBenjamin Poulain2010-03-071-11/+11
| | | | | | | * | | | | Avoid memory allocations in conversion from Gb2312/Gb18030 to unicodeBenjamin Poulain2010-03-071-14/+37
| | | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0774-3191/+3917
| | | | | | | |\ \ \ \ \
| | | | | | * | | | | | | don't try to build corewlan plugin when corewlan was not found at configureLorn Potter2010-03-071-1/+1
| | | | | | | |/ / / / / | | | | | | |/| | | | |
| | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-0687-3237/+12470
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0574-3190/+3916
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0574-3190/+3916
| | | | | | | | |\ \ \ \ \ \