summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-2216-13/+489
|\
| * Fix compiler warnings in qelfparserArvid Ephraim Picciani2010-10-222-3/+4
| * uic: Add autotests for layout alignmentFriedemann Kleint2010-10-222-0/+132
| * Designer: Support alignment in box and grid layouts.Friedemann Kleint2010-10-2212-10/+353
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-2226-25/+415
|\ \
| * | Fixed a newly added autotest for QGraphicsView hover_leave.Denis Dzyubenko2010-10-221-1/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-2126-25/+415
| |\ \ |/ / /
| * | Fix linux-clang license headerTor Arne Vestbø2010-10-211-19/+19
| * | Add mkspecs for Clang on Linux and Mac OS XTor Arne Vestbø2010-10-207-0/+291
| * | Handle Objective-C/C++ sources in SOURCES gracefullyTor Arne Vestbø2010-10-203-12/+20
| * | configure: Don't use character class when looking for QMAKE_CONF_COMPILERTor Arne Vestbø2010-10-201-1/+1
| * | removed shlobj.h to prevent different redefinitions for Windows Embedded 7Oliver Gutbrod2010-10-201-1/+0
| * | enums are defined as typedefs for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+3
| * | windef.h needs to be include before types.h for Windows Embedded 7Oliver Gutbrod2010-10-202-0/+5
| * | defines GID_* for Windows Embedded 7Oliver Gutbrod2010-10-201-1/+14
| * | WM_GESTURE and WM_GESTURENOTIFY are not defined together for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+2
| * | SPI_GETPLATFORMTYPE not defined for Windows Embedded 7Oliver Gutbrod2010-10-202-0/+7
| * | Make QCompleter return current parent instead of invalid indexZeno Albisser2010-10-201-1/+1
| * | make QFileDialog completer return proper dirnames in rootZeno Albisser2010-10-201-1/+4
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-196-9/+68
| |\ \
| | * | Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.Denis Dzyubenko2010-10-195-8/+67
| | * | Designer: Enable morphing into QTextBrowser.Friedemann Kleint2010-10-191-1/+1
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-2116-13/+298
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fix compilation with QT_NO_KEYWORDSOlivier Goffart2010-10-211-1/+1
| * | Replaced sample text for Japanese fontTasuku Suzuki2010-10-201-4/+6
| * | Fix the #ifdef position.Fabien Freling2010-10-203-4/+7
| * | Deactivate the auto-test on problematic platforms.Alexis Menard2010-10-201-0/+3
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-1914-9/+286
| |\ \ |/ / /
| * | Enable the unified toolbar with the rasterFabien Freling2010-10-196-4/+20
| * | configure: Don't use character class when looking for QMAKE_CONF_COMPILERTor Arne Vestbø2010-10-191-1/+1
| * | Moving the resetInternalData slot to QAbstractProxyModelGabriel de Dietrich2010-10-194-26/+26
| * | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2010-10-194-0/+198
| * | Emit beginResetModel before updating the strings.Stephen Kelly2010-10-191-1/+2
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-192-2/+64
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-182-2/+64
| | |\ \
| | | * | Send the hoverLeave not properly sent on the widget inside QGPW.Alexis Menard2010-10-182-2/+64
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-19100-606/+1580
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix CI by recreating reference bitmaps for text comparisonJoona Petrell2010-10-199-0/+0
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-19106-606/+1580
| |\ \ \ \ |/ / / / /
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-18106-606/+1580
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-15106-606/+1580
| | |\ \ \ | | | |/ / | | |/| |
| | | * | tst_qdeclarativetext: Regenerate the baselines after the merge.Olivier Goffart2010-10-159-0/+0
| | | * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-15100-606/+1580
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-141-0/+7
| | | | |\ \
| | | | | * | Giving Qt a default app server when Avkon is removedmread2010-10-141-0/+7
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-144-2/+113
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | TextInput autoscroll now scrolls when the cursor movesAlan Alpert2010-10-141-0/+1
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-141-0/+108
| | | | | |\ \
| | | | | | * | Add new behavior example.Yann Bodson2010-10-131-0/+108
| | | | | |/ / | | | | |/| |
| | | | | * | Fix samegame tutorial jsAlan Alpert2010-10-141-1/+1