summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-17730-6261/+24045
|\
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-1652-174/+2088
| |\
| | * Merge remote-tracking branch 'integration/qt-master-from-4.7' into HEADThiago Macieira2011-03-162-5/+10
| | |\
| | | * QTcpSocket: Fix for disconnect in Unbuffered mode.Markus Goetz2011-03-162-5/+10
| | | * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-1515-22/+198
| | | |\
| | * | \ Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-1651-169/+2078
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-168-59/+250
| | | |\ \ \
| | | | * | | QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.Tapani Pälli2011-03-161-1/+1
| | | | * | | Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-167-58/+249
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-163-3/+52
| | | |\ \ \ \
| | | | * | | | Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-163-3/+52
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-1515-19/+1484
| | | |\ \ \ \ \
| | | | * | | | | Hot fix for compilation without QGL_USE_TEXTURE_POOLJani Hautakangas2011-03-151-0/+2
| | | | * | | | | Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-1515-19/+1482
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-154-25/+47
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Designer: Fix a bug affecting tab reordering of promoted tab widgets.Friedemann Kleint2011-03-151-2/+4
| | | | * | | | | Designer: Fix a bug clearing the Z-Order when adding a new widget.Friedemann Kleint2011-03-151-1/+1
| | | | * | | | | Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-152-22/+42
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-1541-465/+825
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | / | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Fix the license info for bin/elf2e32_qtwrapper.pl.Liang Qi2011-03-151-0/+40
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-151-6/+8
| | | | |\ \ \ \
| | | | | * | | | Avoid panics in QDesktopWidget on Symbian emulator.Laszlo Agocs2011-03-151-6/+8
| | | | * | | | | QS60Style: use placeholder texture when polishing widgets and paletteSami Merila2011-03-153-7/+33
| | | | * | | | | Regression: QS60Style: Theme background is incorrectSami Merila2011-03-151-0/+1
| | | | |/ / / /
| | | | * | | | Remove changes from fix to QTBUG-17045 that were not related to the fixSami Merila2011-03-151-12/+16
| | | | * | | | Prevent null pointer crash when closing splitviewSami Merila2011-03-152-17/+14
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-1436-429/+741
| | | | |\ \ \ \
| | | | | * | | | Fix qgraphicstransform autotest for Symbian, where qreal is float.Laszlo Agocs2011-03-141-2/+12
| | | | | * | | | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-1435-427/+729
| | | | | |\ \ \ \
| | | | | | * | | | Removed reference to nonexistant profile.axis2011-03-041-1/+0
| | | | | | * | | | Disable capabilities example for symbian-gcce due to a bug in elf2e32axis2011-03-041-0/+3
| | | | | | * | | | Readded a ';;' that was removed by mistake.axis2011-03-041-0/+1
| | | | | | * | | | Fixed mkspec detection for Symbian.axis2011-03-041-3/+2
| | | | | | * | | | Removed javascript-jit from default symbian-gcce build.axis2011-03-041-0/+2
| | | | | | * | | | Corrected a mismerge in GCCE link parameters.axis2011-03-041-1/+1
| | | | | | * | | | Fixed incorrect referral to an include file.axis2011-03-041-1/+1
| | | | | | * | | | Fixed win32-msvc2008 build regression.axis2011-03-042-9/+5
| | | | | | * | | | Made qmake strip trailing \ from libdirs.axis2011-03-041-1/+4
| | | | | | * | | | Fixed GCCE libdir handling if the paths have spaces in them.axis2011-03-041-9/+9
| | | | | | * | | | Added MinGW support for adding lib prefix and extension via profile.axis2011-03-044-9/+21
| | | | | | * | | | Added support for various special compiler/linker flags on MinGW.axis2011-03-041-0/+18
| | | | | | * | | | Added support for rvct_linker config in qmake's MinGW generator.axis2011-03-041-3/+11
| | | | | | * | | | Avoided some MinGW specific codepaths when building Symbian libs.axis2011-03-042-3/+4
| | | | | | * | | | Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-03-041-0/+6
| | | | | | * | | | Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-03-041-6/+6
| | | | | | * | | | Fixed a typo in src profile.axis2011-03-041-1/+1
| | | | | | * | | | Fixed a build library deployment issue in sqlite.axis2011-03-041-0/+6
| | | | | | * | | | Fixed include in network module on Symbian.axis2011-03-041-1/+1
| | | | | | * | | | Added object script support to RVCT when using MinGW qmake generator.axis2011-03-042-8/+40
| | | | | | * | | | Added Symbian makefile building support using MinGW backend.axis2011-03-043-4/+10