summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Protect against deleted windowsLars Knoll2011-06-081-0/+16
* Fix compile when configure with no fontconfig supportJiang Jiang2011-06-081-3/+3
* Fix warning in qtextengine compilationJiang Jiang2011-06-081-1/+1
* Reorder member varibles in QGlyphRunPrivate to eliminate warningJiang Jiang2011-06-081-4/+4
* Revert 36e01e69Jiang Jiang2011-06-081-4/+0
* Add function QGlyphRun::setRawData()Eskil Abrahamsen Blomfeldt2011-06-066-53/+111
* Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-061251-25682/+21754
|\
| * drop the SysV semaphores -specific code out from QWSSignalHandlerRitt Konstantin2011-06-014-54/+54
| * minor refactoring of the QWSLock classRitt Konstantin2011-06-012-68/+47
| * simplify the code by using the EINTR_LOOP macroRitt Konstantin2011-06-011-36/+36
| * simplify the semaphores initializationRitt Konstantin2011-06-011-17/+6
| * minor refactoring of the QLock classRitt Konstantin2011-06-011-82/+46
| * add a warning on an incorrect usage of QLockRitt Konstantin2011-06-011-0/+2
| * make sure we really clear all locksRitt Konstantin2011-06-011-1/+1
| * fix build with QT_NO_QWS_SIGNALHANDLERRitt Konstantin2011-06-014-5/+29
| * Fix build in C++0x modeBernhard Rosenkraenzer2011-05-313-8/+8
| * Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-241241-21059/+21172
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-05-191241-21057/+21170
| | |\
| | | * Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-05-181-17/+17
| | | * Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-1870-4462/+560
| | | |\
| | | * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131246-21159/+21159
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-191-1/+1
| | |\ \ \
| | | * | | Fixed compile of qdrawhelper_neon.cpp.Samuel Rødal2011-05-191-1/+1
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-191-1/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix rendering of Mac controls onto a QImageAndy Shaw2011-05-181-1/+1
| * | | | | Fix in-process drag-n-drop of image data, image/* was not available.David Faure2011-05-191-6/+22
| |/ / / /
| * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-1724-58/+355
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1610-31/+85
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-144-38/+48
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-134-38/+48
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-05-131-15/+20
| | | | |\ \ \ \
| | | | | * | | | Fix softkey icon positioning in S60 5.3Miikka Heikkinen2011-05-131-15/+20
| | | | * | | | | Support word selection list with predictive text from splitviewSami Merila2011-05-133-23/+28
| | | | |/ / / /
| | * | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-135-4/+14
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-131-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Make TextEdit word selection more natural.Andrew den Exter2011-05-131-1/+1
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-123-3/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Clear confusion between QMainWindow and QMainWindowLayout.Fabien Freling2011-05-123-3/+1
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-0/+12
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Fix for rounded corners bug in QMenuJani Hautakangas2011-05-121-0/+12
| | * | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-123-3/+7
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-1/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | QWidgetPrivate::setParent_sys might be using null pointerSami Merila2011-05-121-1/+1
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-121-1/+3
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Ensure the TextEdit cursor delegate is repositioned on mouse events.Andrew den Exter2011-05-121-1/+3
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-121-1/+3
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Don't crash on an invalid replacementStart from an input method.Andrew den Exter2011-05-121-1/+3
| | | | * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-2789-543/+2964
| | | | |\ \ \ \ \ \
| | * | | | | | | | | CompileOlivier Goffart2011-05-121-1/+0
| | * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-1110-6/+255
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /