summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-4/+4
|\
| * Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-214-43/+109
| |\
| * | Bump Qt version to 4.7.4Timo Turunen2011-03-2110-29/+29
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-224-1/+39
|\ \ \
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-194-1/+39
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-184-1/+39
| | |\ \
| | | * | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-184-1/+39
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-213-5/+17
|\ \ \ \ \
| * | | | | Designer: Remember default of main container's object name.Friedemann Kleint2011-03-212-3/+15
| * | | | | Designer: Do not translate page object names of QMdiArea.Friedemann Kleint2011-03-211-2/+2
* | | | | | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-2129-2847/+1576
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-166-46/+76
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-164-43/+71
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| |
| | | * | Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-164-43/+71
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-152-3/+5
| | |\ \ \ | | | |/ /
| | | * | Designer: Fix a bug affecting tab reordering of promoted tab widgets.Friedemann Kleint2011-03-151-2/+4
| | | * | Designer: Fix a bug clearing the Z-Order when adding a new widget.Friedemann Kleint2011-03-151-1/+1
| * | | | Merge earth-team into masterOlivier Goffart2011-03-1523-2801/+1500
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Don't compile qtconfig on symbianOlivier Goffart2011-02-281-1/+1
| | * | | qtconfig: don't connect to qt3support signalsOlivier Goffart2011-02-282-7/+8
| | * | | Fix errors and warnings in qtconfig.Olivier Goffart2011-02-282-2/+2
| | * | | Remove qt3support dependency of qtconfigOlivier Goffart2011-02-2823-2798/+1496
* | | | | Merge remote branch 'qt-mainline/master'aavit2011-03-1527-34/+34
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-1128-26/+30
| |\ \ \ \
| | * | | | Update copyright year to 2011.Rohan McGovern2011-03-1025-25/+25
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-113-10/+10
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-1010-31/+31
| | |\ \ \ \
| | | * | | | Bump Qt version to 4.7.3Timo Turunen2011-03-0910-31/+31
* | | | | | | Introduce QFontEngineDirectWriteEskil Abrahamsen Blomfeldt2011-03-141-2/+32
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-101-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-091-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-03-081-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2011-03-081-1/+1
| | | |\ \ \ \
| | | | * | | | Update copyright year to 2011.Jason McDonald2011-01-101182-1193/+1193
| | | | * | | | embed copyright information in QtAssistantClient4.dllJoerg Bornemann2010-12-171-0/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix warning about uninitialised variable useThiago Macieira2011-03-081-1/+1
* | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-083-1/+14
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-083-1/+14
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-073-1/+14
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-073-1/+14
| | | | |/ / / / | | | |/| | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-083-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Designer: Set dirty correctly in case resource paths were changed.Friedemann Kleint2011-03-073-1/+5
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-021-0/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | qdoc3: Fix compilation with -no-stlhjk2011-03-021-0/+2
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-281-0/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-281-0/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Store property editor's column positions in settingsJarek Kobus2011-02-231-0/+4
generated by cgit v0.12 at 2024-11-13 09:17:19 (GMT)