summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-11169-3722/+5061
|\
| * 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-10111-716/+1644
| |\
| | * Document - and use - the qmlRegisterXXX template functionsmae2010-03-1024-197/+254
| | * 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-1088-519/+1387
| | |\
| | | * 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-10116-3357/+4262
| | | |\
| | | * | Oooops --- revert wrong commitmae2010-03-101-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-1018-113/+320
| |\ \ \ \
| | * | | | Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGLTom Cooksey2010-03-101-2/+2
| | * | | | 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 tst_QGL::getSetCheck to check for new (correct) behaviourTom Cooksey2010-03-101-6/+7
| | * | | | 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-10960-22372/+43328
| | |\ \ \ \
| | | * | | | Added configure check to diasable building QtDeclarativeJørgen Lind2010-03-101-19/+21
| | | * | | | Fixes Q3ListViewItem grandchildren not sorted if item has one childAlexader Karaivanov2010-03-102-2/+133
| | | * | | | 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-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