summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* simplify QSharedMemory::detach()Ritt Konstantin2011-01-213-5/+3
* avoid extra calculationsRitt Konstantin2011-01-212-4/+2
* fix error reporting on detach()Ritt Konstantin2011-01-211-1/+1
* fix error reportingRitt Konstantin2011-01-211-0/+1
* Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.Miikka Heikkinen2011-01-212-3/+3
* Fix to pen state handling in OpenVG paint engine.Jani Hautakangas2011-01-211-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-217-10/+31
|\
| * BorderImage fails for .sci source containing a URLMartin Jones2011-01-213-5/+13
| * positionViewAtIndex can fail when positioned near end of list.Martin Jones2011-01-214-5/+18
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-213-89/+67
|\ \ | |/
| * Revert "Fix loaded() signal to be emitted only once"Bea Lam2011-01-213-89/+67
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-203-11/+13
|\
| * Revert "don't include harfbuzz where we don't use it"Oswald Buddenhagen2011-01-205-0/+9
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-208-20/+13
| |\ |/ /
| * don't accidentaly enable egl when disabling openvgRitt Konstantin2011-01-201-1/+3
| * be more consistent about CFG_EGL_GLES_INCLUDES interpretationRitt Konstantin2011-01-201-1/+1
| * fix build with -opengl es1 in some casesRitt Konstantin2011-01-201-5/+5
| * don't include harfbuzz where we don't use itRitt Konstantin2011-01-205-9/+0
| * don't assign MANIFEST_DIR if we don't need itOswald Buddenhagen2011-01-202-4/+4
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-201-22/+34
|\ \ | |/ |/|
| * Improved QMAKE_POST_LINK support in symbian-sbsv2Miikka Heikkinen2011-01-201-22/+34
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-203-12/+11
|\
| * Switch default Phonon backend on Symbian from Helix to MMFGareth Stockwell2011-01-191-12/+6
| * Do not load aplication fonts on Symbian^1 and belowAlessandro Portale2011-01-191-0/+3
| * Fix compilation error.Jason McDonald2011-01-191-0/+2
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-192-1/+8
|\ \
| * | Use SRCDIR as a base path for the test data.Lucian Varlan2011-01-192-1/+4
| * | Add the test data to the INSTALLS targetAdrian Constantin2011-01-191-0/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-192-2/+18
|\ \ \ | |_|/ |/| |
| * | Cleanup created views in TextEdit tests.Martin Jones2011-01-191-0/+12
| * | TextEdit implicit size varied depending upon wrapMode.Martin Jones2011-01-191-2/+6
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-194-28/+225
|\ \ \
| * | | Supporting Qt application fonts on SymbianAlessandro Portale2011-01-194-28/+225
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-192-16/+9
|\ \ \ | |/ / |/| / | |/
| * fix doubleformat config.testRitt Konstantin2011-01-191-1/+1
| * stabilize qmake autotestRitt Konstantin2011-01-191-15/+8
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-01-184-4/+191
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-01-184-4/+191
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-01-184-4/+191
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-01-175-5/+191
| | | |\
| | | | * Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-01-175-5/+191
| | | | |\
| | | | | * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-141-1/+0
| | | | | |\
| | | | | | * Revert "Add a warning about trying to release a timer ID that isn't active"Jan-Arve Sæther2011-01-141-1/+0
| | | | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-133-2/+187
| | | | | |\ \ | | | | | | |/
| | | | | | * Some unit tests for layout explosion thingyJohn Tapsell2011-01-131-0/+158
| | | | | | * Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005fJan-Arve Sæther2011-01-132-2/+29
| | | | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-101-2/+4
| | | | | |\ \ | | | | | | |/
| | | | | | * Build failure fix (related to QT-4079)Sami Merila2011-01-101-1/+1
| | | | | | * QWidgets support for VGA screenSami Merila2011-01-101-1/+3
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-182-8/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |