summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-3034-248/+201
|\
| * Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.Thiago Macieira2010-03-301-3/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-3034-248/+202
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-3034-248/+202
| | |\
| | | * Fix compile error on mingw.Jason McDonald2010-03-301-1/+4
| | | * MONILITY-645Wolfgang Beck2010-03-305-18/+71
| | | * Do not override alternate background color in PlastiqueJens Bache-Wiig2010-03-291-1/+0
| | | * Fix QComboBox ignoring foreground role in some stylesJens Bache-Wiig2010-03-291-1/+9
| | | * Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't definedThiago Macieira2010-03-291-1/+1
| | | * Ensure that we return QPair<long,long> in all cases.Thiago Macieira2010-03-291-3/+3
| | | * Update PLATFORM(SPARC64) to CPU(SPARC64)Thiago Macieira2010-03-291-1/+1
| | | * Support EtchDisabledText with spin box on Windows styleJens Bache-Wiig2010-03-291-2/+6
| | | * QNAM HTTP: Fix invoking a method when being destructed right nowPeter Hartmann2010-03-291-3/+6
| | | * Fixed a typo in the QDoubleValidotor doc.Denis Dzyubenko2010-03-291-1/+1
| | | * Trivial fix to JavaScriptCore to fix building with MSVC 2010John Brooks2010-03-272-4/+4
| | | * Remove QGuard.Thiago Macieira2010-03-264-197/+1
| | | * QtScript: Add yet more missing API shimsKent Hansen2010-03-264-4/+65
| | | * QtScript: Make sure the old identifier table is restoredKent Hansen2010-03-263-3/+6
| | | * Fix compile error with QT_NO_TEXTHTMLPARSER in QtGuiTasuku Suzuki2010-03-261-1/+4
| | | * uic3: -extract: Write XPM-images correctly.Friedemann Kleint2010-03-268-7/+20
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-03-3056-540/+881
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-3038-419/+583
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-301-0/+3
| | |\ \ \ \
| | | * | | | Fix a crash in QGtkStyle when theme not availableJens Bache-Wiig2010-03-301-0/+3
| | * | | | | Exporting QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-292-0/+2
| | * | | | | Adding QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-291-0/+5
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-292-11/+17
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fixed crash in Phonon MMF backend during application shutdownGareth Stockwell2010-03-291-1/+7
| | | * | | | Fixed bitfield-related crash on Symbian WINSCWGareth Stockwell2010-03-291-10/+10
| | * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-295-14/+46
| | * | | | | Compile with MSVC 2005 and 2003 when no platform SDK is usedAndy Shaw2010-03-291-0/+5
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-2926-137/+481
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-293-3/+14
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-2925-135/+468
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-291-9/+18
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-03-294-15/+57
| | | |\ \ \ \ \
| | | * | | | | | QS60Style: very tall QSpinBox's buttons hide lineEditSami Merila2010-03-291-9/+18
| | * | | | | | | Export QGLContextResource for use with Qt/3DRhys Weatherley2010-03-291-1/+1
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-30122-2071/+4391
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-03-3019-121/+298
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-3077-1186/+2840
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-2968-358/+1320
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-16/+36
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-16/+36
| | | | |\ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-16/+36
| | | | | |\ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | | | * | | Fix compile error on Symbian 9.1, caused in network/access.Frans Englich2010-03-262-14/+33
| | | | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-2/+3
| | | | | | |\ \ \
| | | | | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-2/+3
| | | | | | | |\ \ \
| | | | | | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-252-2/+3
| | | | | | | | |\ \ \
| | | | | | | | | * | | QNAM HTTP: Symbian compile fixMarkus Goetz2010-03-251-0/+1