summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-3124-3531/+3772
|\
| * Fix regression on SymbianShane Kearns2010-03-311-1/+1
| * Fix broken test caseShane Kearns2010-03-311-0/+7
| * Cleanup the deployment codeThomas Zander2010-03-315-10/+8
| * Fix 'make sis' finding the dll on symbianThomas Zander2010-03-314-4/+4
| * Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-31210-2558/+5930
| |\
| * | Re-add line that was lost during webkit update.Thomas Zander2010-03-301-0/+1
| * | Work around bad naming of exported class in symbian sdk causing conflictThomas Zander2010-03-301-0/+3
| * | Fix building on public symbian SDK.Thomas Zander2010-03-301-2/+2
| * | Fix qmake with the symbian makespec failing when project has a dash in itThomas Zander2010-03-301-2/+2
| * | Make s60main static lib not depend on QtCoreThomas Zander2010-03-302-5/+48
| * | Remove stray non-latin1 characterThomas Zander2010-03-301-1/+1
| * | Fix out-of-source symbian build for external appsThomas Zander2010-03-301-1/+1
| * | Update EABI def files for 4.7Shane Kearns2010-03-306-3508/+3456
| * | Merge remote branch 'qt/4.7' into 4.7Shane Kearns2010-03-301408-20468/+23246
| |\ \
| * | | Exporting QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-292-2/+4
| * | | Adding QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-291-0/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-3176-119/+479
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-311-20/+31
| |\ \ \ \
| | * | | | Optimize QDeclarativeEngine::importExtensionmae2010-03-311-20/+31
| * | | | | Fix bug when adding import paths manuallyAlan Alpert2010-03-311-1/+7
| * | | | | Update CommentAlan Alpert2010-03-311-1/+1
| |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-3174-97/+440
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-31284-2874/+6408
| | |\ \ \
| | | * | | QGraphicsEffect : Don't rely on the exposedArea when rendering the item into ...Alexis Menard2010-03-311-1/+1
| | | * | | Minor cleanup.Yann Bodson2010-03-312-6/+5
| | | * | | Improve flipable example.Yann Bodson2010-03-319-33/+84
| | | * | | Minor cleanup for visual test framework.Michael Brasser2010-03-315-11/+11
| | | * | | VisibleArea is not a creatable type.Michael Brasser2010-03-311-1/+1
| | | * | | More testing.Michael Brasser2010-03-312-1/+9
| | | * | | Test openUrlExternallyWarwick Allison2010-03-312-2/+29
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-3179-695/+1319
| | | |\ \ \
| | | | * | | Update examples/declarative.proYann Bodson2010-03-311-1/+1
| | | | * | | Update mouseX(Y) when clicking on a mouse areaLeonardo Sobral Cunha2010-03-313-0/+57
| | | | * | | Declarative examples cleanup.Yann Bodson2010-03-313-25/+31
| | | | * | | Add test.Michael Brasser2010-03-312-0/+75
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-3137-0/+22
| | | | |\ \ \
| | | * | | | | docWarwick Allison2010-03-311-0/+8
| | | * | | | | example of WebView onAlert, and of popups in general.Warwick Allison2010-03-312-0/+63
| | | * | | | | docWarwick Allison2010-03-311-0/+4
| | | * | | | | Move gitignore to right level, update for Linux.Warwick Allison2010-03-312-2/+5
| | | | |/ / / | | | |/| | |
| | | * | | | Cleanup MouseArea visual tests.Michael Brasser2010-03-3137-0/+18
| | | * | | | See if we can get the visual tests working on qws.Michael Brasser2010-03-301-0/+4
| | * | | | | Fix snapping in listview.Martin Jones2010-03-312-15/+35
* | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-03-3127-120/+427
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert 4.6 commits that shouldn't be in 4.7.Thiago Macieira2010-03-318-3/+287
| * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-3131-401/+424
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-3115-306/+60
| |\ \ \ \ \ \
| | * | | | | | Revert "Add a children private property needed for QML to support QGraphicsOb...Alexis Menard2010-03-317-273/+0
| | * | | | | | Revert "struct -> class, it's better."Alexis Menard2010-03-311-2/+1