summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'runonphone_targets' into 4.7-s60axis2010-06-117-26/+28
|\
| * Moved runonphone target to prf files for all build systems.axis2010-06-117-27/+24
| * Fixed destdir not being defined.axis2010-06-101-0/+4
| * Enable runonphone target for libraries as well.axis2010-06-101-2/+3
* | Fix recursive targets for src.proMiikka Heikkinen2010-06-111-1/+1
* | Fix recursive 'make sis' for symbian buildsMiikka Heikkinen2010-06-111-2/+13
* | Update 4.7 def filesShane Kearns2010-06-104-24/+67
|/
* QS60Style: QComboBox displays checkboxes for itemsSami Merila2010-06-101-1/+8
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-102-2/+3
|\
| * Explicit EXPORTUNFROZEN will prevent default defBlock generationMiikka Heikkinen2010-06-102-2/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-101-0/+1
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-101-0/+1
| |\ \ |/ / /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Toby Tomkins2010-06-1048-116/+769
| |\ \
| * | | Problems with missing symbols on QWS/AIX. Include freetype synthesis file for...Toby Tomkins2010-06-101-0/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-091-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix qtlibinfix build of qml plugins (for Symbian)Alessandro Portale2010-06-091-0/+1
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-092-5/+5
|\ \ \
| * | | Fix Symbian install path for Qml pluginsAlessandro Portale2010-06-091-4/+4
| * | | Fixed DEPLOYMENT variable check in sis_targets.prfMiikka Heikkinen2010-06-091-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-091-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed qdoc3 crash.Rohan McGovern2010-06-091-3/+3
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-091-1/+1
|\ \ \ | | |/ | |/|
| * | Fixed compilation for solaris based compilers, macro doesn't require trailing...Toby Tomkins2010-06-091-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-081-15/+91
|\ \ \ | | |/ | |/|
| * | Fix the Qt application icon on SymbianAlessandro Portale2010-06-081-15/+91
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-081-1/+1
|\ \
| * | Change the directory where smart-installable application package isMiikka Heikkinen2010-06-081-1/+1
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-0845-97/+674
|\ \ \ | |_|/ |/| |
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-0845-97/+674
| |\ \ |/ / /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-080-0/+0
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-080-0/+0
| | |\ \ | |/ / /
| | * | Merge commit 'v4.6.3' into 4.6Jason McDonald2010-06-080-0/+0
| | |\ \
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...v4.6.3Simon Hausmann2010-06-013-2/+12
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-012-12/+28
| | | * | Always construct s60 screen furniture even if not used.Janne Koskinen2010-06-011-4/+1
| | | * | Change to release licenses for 4.6.3.Jason McDonald2010-05-308885-115693/+115693
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-075-0/+108
| |\ \ \ \
| | * | | | fix translations from some header files being omittedOswald Buddenhagen2010-06-075-0/+108
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-071-392/+370
| |\ \ \ \ \ | | |/ / / /
| | * | | | Revert changes to syncqt.Joerg Bornemann2010-06-071-392/+370
| |/ / / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-071-1/+1
| |\ \ \ \
| | * | | | Fix style sheet error with slider handleqCaro2010-06-071-1/+1
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-041-370/+392
| |\ \ \ \ \
| | * | | | | deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-041-4/+26
| | * | | | | syncqt: tabs changes to spacesJoerg Bornemann2010-06-041-369/+369
| | |/ / / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-043-6/+40
| |\ \ \ \ \ | | |/ / / /
| | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-043-6/+40
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-032-4/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | fix misleading hintOswald Buddenhagen2010-06-031-1/+1
| | * | | | support TARGETs with spacesOswald Buddenhagen2010-06-031-3/+3
| |/ / / /