summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-25292-6035/+21775
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-252-0/+8
| |\
| | * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
| | |\
| | | * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
| | | |\
| | | | * Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-11-242-0/+8
| | | | |\
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-242-0/+8
| | | | | |\
| | | | | | * Fix compliation of ALSA audio backend when checking for surround support.Justin McPherson2010-11-242-0/+8
| | | | | |/
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-25290-6035/+21767
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-251-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | fix inf loop bughawcroft2010-11-251-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2485-627/+1480
| | |\ \ \ \
| | | * | | | Fixed tst_qwidget::winIdChangeEventGareth Stockwell2010-11-241-12/+17
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2484-615/+1463
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Use parent class function to generate Makefile headers in SymbianMiikka Heikkinen2010-11-232-20/+3
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-231-1/+1
| | | | |\ \ \
| | | | | * | | Fix QPixmap::fromImage() in the OpenVG pixmap backend.Jason Barron2010-11-231-1/+1
| | | | * | | | Fix spacesJanne Koskinen2010-11-232-2/+2
| | | | |/ / /
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-232-17/+35
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-231-0/+3
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch '4.7-s60' into 4.7-s60axis2010-11-230-0/+0
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' into 4.7-s60axis2010-11-23121-5184/+7779
| | | | | |\ \ \ \ \
| | | | * | | | | | | Native color dialog on symbianMilla Pohjanheimo2010-11-233-6/+131
| | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | Fix non-stroked filled paths in OpenVG paint engine.Jason Barron2010-11-231-0/+3
| | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-23123-5219/+7796
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | | |/ / /
| | | | * | | | Fix symbian-mmp.conf include pathMiikka Heikkinen2010-11-222-3/+3
| | | | * | | | Fix a build break when namespace is definedMiikka Heikkinen2010-11-221-17/+17
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-1978-591/+1328
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-192-17/+35
| | | | | |\ \ \ \
| | | | | * | | | | Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-1916-55/+91
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-1927-627/+624
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-1869-524/+1212
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Add symbian scope for qfiledialog_symbian.cppMiikka Heikkinen2010-11-181-1/+1
| | | | | | | * | | | | Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-189-5/+32
| | | | | | | * | | | | Make epocroot resolving compatible with more build environmentsMiikka Heikkinen2010-11-182-57/+51
| | | | | * | | | | | | Corrected ASCII comparison and removed extra bracesTitta Heikkala2010-11-192-20/+15
| | | | | | |/ / / / / | | | | | |/| | | | |
| | | | | * | | | | | Fix for QtOpenGL RVCT4 compilation errorJani Hautakangas2010-11-181-17/+17
| | | | | * | | | | | Removed extra cpp and done changes based on commentsTitta Heikkala2010-11-183-20/+14
| | | | | * | | | | | Correct flags for Symbian file dialogsTitta Heikkala2010-11-181-1/+1
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-1857-445/+1118
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-18484-13505/+10782
| | | | | | |\ \ \ \ \ \
| | | | | | * | | | | | | Fix for WServ 64 crash on Symbian.Jani Hautakangas2010-11-172-2/+11
| | | | | | * | | | | | | Use include(original mkspec) instead of copying of mkspec to defaultMiikka Heikkinen2010-11-161-8/+10
| | | | | | * | | | | | | Fixed code style of d92cbfc5, reported by git push.Janne Anttila2010-11-151-3/+3
| | | | | | * | | | | | | Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.Janne Anttila2010-11-152-84/+97
| | | | | | * | | | | | | Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.Janne Anttila2010-11-151-20/+4
| | | | | | * | | | | | | Documented usage of dialogs on SymbianTitta Heikkala2010-11-153-0/+8
| | | | | | * | | | | | | Native file dialog on Symbian^3Titta Heikkala2010-11-153-9/+278
| | | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-1246-325/+713
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Add Location as self signable capability in patch_capabilities.plMiikka Heikkinen2010-11-121-1/+5
| | | | | | | * | | | | | | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-1220-261/+638