summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-126-0/+13
* QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-122-8/+4
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qtwebkitStaging-4.7Jocelyn Turcotte2010-04-1268-797/+1830
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-122-1/+10
| |\
| | * Add meta-data keys for embedded images.Andrew den Exter2010-04-122-1/+10
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-1228-631/+1423
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-1028-631/+1423
| | |\ | |/ /
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-1028-631/+1423
| | |\
| | | * Fix build error in QtGui armv5 udebShane Kearns2010-04-091-1/+1
| | | * Updated qtbench to build against modified QStaticText APIGareth Stockwell2010-04-091-2/+2
| | | * Make compiling / linking a non-qt app work too on symbian/gcceThomas Zander2010-04-082-11/+14
| | | * When on Symbian use smaller files.Aleksandar Sasha Babic2010-04-081-3/+6
| | | * Fixing the missing "\\"Aleksandar Sasha Babic2010-04-081-1/+1
| | | * The cmd line arguments have not been delegated properly.Aleksandar Sasha Babic2010-04-081-32/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-04-08771-7758/+18989
| | | |\
| | | | * Add --download option to runonphoneShane Kearns2010-04-071-36/+42
| | | | * Implement download support to TRK LauncherShane Kearns2010-04-073-24/+200
| | | | * Fix library creation on symbian/gcceThomas Zander2010-04-071-0/+1
| | | | * Update Symbian def files for 4.7Shane Kearns2010-04-0713-510/+1109
| | | | * Various fixes for symbian/gcce building.Thomas Zander2010-04-073-17/+33
| | | | * Make encoding clearThomas Zander2010-04-071-2/+2
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-072-3/+20
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-062-3/+20
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-062-3/+20
| | | | | | |\
| | | | | | | * Fix 'make sis' working on symbian makefile based system again.Thomas Zander2010-04-061-3/+9
| | | | | | | * Make shipped symbian scripts available from the build-dir bin dir.Thomas Zander2010-04-061-0/+11
| | | * | | | | Clear QFontCache TLS content before nullifying TLS pointer.Janne Koskinen2010-04-081-1/+3
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-103-3/+29
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Reimplemented event() and sceneEvent() in video item, for BC.Dmytro Poplavskiy2010-04-082-2/+24
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-071-1/+5
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Fix Phonon build with mingw.Andrew den Exter2010-04-071-1/+5
| * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-1041-166/+412
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-096-6/+159
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-0911-20/+174
| | | |\ \ \ \ \ \
| | | | * | | | | | Regressions in Global Object prototype accessKent Hansen2010-04-093-4/+144
| | | | * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-093-2/+15
| | * | | | | | | | Merge branch '4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-095-14/+15
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Autotest: fix paths on the test server after update.Thiago Macieira2010-04-094-13/+14
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-091-1/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Fix typo in docs.Jason McDonald2010-04-091-1/+1
| | * | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-0932-147/+239
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | _ / / / / / / | | | / / / / / /
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-095-24/+76
| | |\ \ \ \ \ \ \
| | | * | | | | | | Corruption in data captured by QAudioInputKurt Korbatits2010-04-091-2/+2
| | | * | | | | | | Just one (static) waveInCriticalSection but multiple QAudioInput toKurt Korbatits2010-04-094-11/+11
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-0711-89/+71
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-073-52/+25
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-073-52/+25
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-063-1/+27
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-063-1/+27
| | | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | | * | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-063-1/+27