summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-11104-3017/+3742
|\
| * Comment out unused method.Martin Jones2010-03-102-2/+3
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1070-597/+1253
| |\
| | * Document - and use - the qmlRegisterXXX template functionsmae2010-03-107-113/+120
| | * when loading debug import plugins on Mac, try with _debug.dylib suffixmae2010-03-101-0/+3
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1064-484/+1130
| | |\
| | | * fix inclusion of qt_targets.pri in qimportbase.priJoerg Bornemann2010-03-101-1/+1
| | | * Use TARGETPATH instead of hardcoding locationsTobias Hunger2010-03-102-2/+2
| | | * Fix location in which webkit import is stored in builddirTobias Hunger2010-03-101-1/+1
| | | * Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-1071-2765/+3233
| | | |\
| * | | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-1015-85/+165
| |\ \ \ \
| | * | | | Added clipping to the dashed stroke processor in the GL2 engine.Kim Motoyoshi Kalland2010-03-104-30/+105
| | * | | | Fixed assert failure when drawing dashes with raster engine.Kim Motoyoshi Kalland2010-03-101-5/+6
| | * | | | Update QGLFormat from EGLConfig properlyTom Cooksey2010-03-106-45/+38
| | * | | | Make calls to QGLFormat::set*BufferSize also update flagsTom Cooksey2010-03-101-1/+5
| | * | | | Compile fix when Qt3Support is enabled for devices using EGL.Trond Kjernåsen2010-03-101-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-10371-7291/+18758
| | |\ \ \ \
| | | * | | | Fixes Q3ListViewItem grandchildren not sorted if item has one childAlexader Karaivanov2010-03-101-1/+8
| | | * | | | Compile with Qt3Support in a ScratchBox environment.Trond Kjernåsen2010-03-101-1/+1
| | | |/ / /
| | * | | | Cocoa: Fix misaligned text between format changesEskil Abrahamsen Blomfeldt2010-03-101-1/+1
| * | | | | 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-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