summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adjust indentationBernhard Rosenkraenzer2010-04-081-10/+10
* e-Ink support cleanupBernhard Rosenkraenzer2010-04-082-7/+27
* Tweak the display update IOCTL callsBernhard Rosenkraenzer2010-04-081-2/+5
* Support 8-Track e-Ink devicesBernhard Rosenkraenzer2010-04-082-6/+47
* Get stride from LinuxFB instead of calculating it ourselves.Paul Olav Tvete2010-04-081-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-04-0853-658/+1145
|\
| * Fixed bug in QPainterPath::intersected().Samuel Rødal2010-04-082-4/+32
| * Fix compile error with QT_NO_ANIMATIONTasuku Suzuki2010-04-081-3/+2
| * O(n^2) to O(n) optimization in QTreeWidget::selectedItems()Gabriel de Dietrich2010-04-071-1/+5
| * Fix EGLImage & re-enable its use in QtOpenGLTom Cooksey2010-04-072-27/+30
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-301499-11625/+22092
| |\
| | * Fixed the action geometry of menu bar in RTLThierry Bastian2010-04-071-6/+5
| | * Disable EGLImage usageTom Cooksey2010-04-071-24/+24
| | * Revert "Remove references to evr based renderer from .pro."Thierry Bastian2010-04-071-4/+9
| | * Revert "Update Phonon ds9 backend to 4.4.0."Thierry Bastian2010-04-0734-620/+1001
| | * QTreeView: fix PageUp/PageDown with disabled items.Olivier Goffart2010-04-072-0/+36
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-065-15/+14
| | |\
| | | * Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-06318-5597/+6800
| | | |\
| | | | * Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | | * | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-066-3/+31
| | |\ \ \
| | | * | | Doc: update the QDBusPendingCallWatcher example to show where to deleteThiago Macieira2010-04-061-0/+1
| | | * | | Doc: Remove QDBusServer from the public documentation.Thiago Macieira2010-04-061-1/+1
| | | * | | [Cocoa] QDialogs with WindowStayOnStopHint parentCarlos Manuel Duclos Vergara2010-04-061-1/+8
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-063-1/+21
| | | |\ \ \ | | |/ / / /
| | | * | | Fix a coding style issue of the GTK styleBenjamin Poulain2010-04-061-1/+1
| | | * | | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-062-1/+6
| | | * | | Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++Zeno Albisser2010-04-061-0/+15
| * | | | | Fix use of bitmap fonts on some Linux systemsEskil Abrahamsen Blomfeldt2010-03-301-2/+7
* | | | | | Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.Dominik Riebeling2010-04-082-4/+4
| |_|_|_|/ |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
| |\ \ \ \
| | * | | | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| | | |_|/ | | |/| |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-068-2/+490
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-06244-4153/+4402
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-068-2/+491
| | |\ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-064-8/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Empty commit to trigger rebuilding in the CI system.Thiago Macieira2010-04-050-0/+0
| * | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-050-0/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-041-18/+20
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-041-3/+5
|\ \ \ \ \ \ \
| | | * | | | | Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-053-7/+3
| | | * | | | | Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixedThiago Macieira2010-04-041-1/+1
| | |/ / / / /
| | * | | | | Revert "Attempt at fixing Phonon build issue on Symbian."Thiago Macieira2010-04-041-18/+20
| |/ / / / /
| * | | | | Attempt at fixing Phonon build issue on Symbian.Thiago Macieira2010-04-041-3/+5
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-031-0/+14
|\ \ \ \ \
| * | | | | [plugins] Don't conclude that a .debug file is a plugin.Thiago Macieira2010-04-031-0/+14
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0223-3525/+3724
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0223-3525/+3724
| |\ \ \ \ \ \ |/ / / / / / /