summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-10371-9586/+22289
|\
| * Fix Build Failure for Maemo 5 Debug BuildDominik Holland2010-03-101-2/+2
| * Add ability to read last mod.time for zip entry.Ritt Konstantin2010-03-102-0/+19
| * Avoid asserting when index passed to QZipReader::entryInfoAt is out of bounda...Ritt Konstantin2010-03-101-1/+3
| * Add isValid() method to QZipReader::FileInfo.Ritt Konstantin2010-03-102-1/+7
| * Add `QIODevice* device() const` public method to QZip classes.Ritt Konstantin2010-03-103-0/+20
| * Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-10359-9429/+22149
| * Use index-based approach for iterating over JS array propertiesKent Hansen2010-03-101-4/+3
| * Merge remote branch 'origin/4.7-cutoff' into 4.7Morten Johan Sørvig2010-03-1024-94/+864
| |\
| * | QFSFileEngine reduce number of system callsRitt Konstantin2010-03-093-21/+33
| * | remove unneeded "permissions normalization" code from QFileInfoGathererRitt Konstantin2010-03-092-38/+1
| * | remove unneeded code from QFileInfoRitt Konstantin2010-03-092-55/+3
| * | QFSFileEngine: Don't use owner's permissions for current user; calculate them...Ritt Konstantin2010-03-092-12/+22
| * | In QFSFileEngine::fileFlags call getPermissions() only if entry existsRitt Konstantin2010-03-091-24/+17
| * | move permissions calculation code to separate methodRitt Konstantin2010-03-092-28/+37
* | | 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-1072-2768/+3233
|\ \ \ | |/ / |/| |
| * | 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-0972-2765/+3213
| |\ \ | | |/
| | * Revert 12b6987031be9faee3886d7623888feb4e1762afMorten Johan Sørvig2010-03-091-7/+0
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0973-2765/+3220
| | |\
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-092-8/+33
| | | |\
| | | | * 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-091-1/+13
| | | * | doc: Fixed several qdoc errors.Martin Smith2010-03-0916-60/+53
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0961-2710/+3147
| | | |\
| | | | * 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-0861-2676/+3143
| | | | |\
| | | | | * Merge remote branch 'origin/4.7' into 4.7Thiago Macieira2010-03-0813-473/+209
| | | | | |\
| | | | | * | Doc: mark QEasingCurve support functions as new in 4.7.Volker Hilsheimer2010-03-081-0/+2
| | | | | * | Autotest: Fix failing QTextCodec testsThiago Macieira2010-03-081-1/+1
| | | | | * | Doc: mark methods as internal (as they were in previous releases)Volker Hilsheimer2010-03-081-0/+10
| | | | | * | 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-0855-2676/+3123
| | | | | |\ \
| | | | | | * | Carbon: usage of menu bars can cause exceptions to be thrownRichard Moe Gustavsen2010-03-081-1/+1
| | | | | | * | 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-0796-640/+1468
| | | | | | |\ \
| | | | | | | * | 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-0749-2643/+3055
| | | | | | | |\ \