summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1910512-16218/+21370
|\
| * 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-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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Generate createpackage calls with absolute path.Miikka Heikkinen2011-01-181-7/+6
| | * | | | | | Added detection of bat files to the qtPrepareTool function.axis2011-01-181-1/+7
| |/ / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-182-5/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix to data detaching in OpenVG pixmap dataJani Hautakangas2011-01-181-2/+10
| | * | | | | Remove toolcheck from generic clean targets for symbian-sbsv2Miikka Heikkinen2011-01-181-3/+5
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-186-20/+54
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Request font sizes with only 0.5pt resolution.Martin Jones2011-01-186-20/+54
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-181-2/+2
| |\ \ \ \ \ \
| | * | | | | | tst_qhttp: replace legacy qt-test-server hostname in testdata.Rohan McGovern2011-01-181-2/+2
| | |/ / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-181-1/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Revert "Add a warning about trying to release a timer ID that isn't active"Olivier Goffart2011-01-171-1/+0
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1734-1548/+1843
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Make qvfb compile (and work) with libpng 1.5Bernhard Rosenkraenzer2011-01-171-2/+4
| | * | | | | Updates to Galician localizationmarce villarino2011-01-172-1362/+1678
| | * | | | | don't misdetect powermac host systems when determining target archKonstantin Tokarev2011-01-171-1/+1
| | * | | | | Implementation of QNetworkProxyFactory::systemProxyForQuery() for SymbianJeremy Katz2011-01-171-0/+4
| | * | | | | make sure Option::dir_sep is initialized in timeOswald Buddenhagen2011-01-171-0/+2
| | * | | | | don't ignore return code from syncqtOswald Buddenhagen2011-01-172-3/+7
| | * | | | | make qtlibinfix apply to QT_INSTALL_TRANSLATIONSOswald Buddenhagen2011-01-171-0/+2
| | * | | | | clean up platform detection logicOswald Buddenhagen2011-01-171-48/+12
| | * | | | | accept -declarative-debug under unixOswald Buddenhagen2011-01-171-2/+2
| | * | | | | Fix static build on Windows with MinGW.Mark Brand2011-01-178-18/+18
| | * | | | | fix -enable-stdcall-fixup usageOswald Buddenhagen2011-01-171-2/+2
| | * | | | | don't claim declarative debugging support without having declarativeOswald Buddenhagen2011-01-172-3/+9
| | * | | | | installation of translations is now dealt with by translations.proOswald Buddenhagen2011-01-171-5/+0
| | * | | | | German translation fixesFrederik Schwarzer2011-01-171-86/+86
| | * | | | | fix typo in error messagesOswald Buddenhagen2011-01-1717-17/+17
| | | |/ / / | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-179-41/+193
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix one character displacement for cursor in line editsMiikka Heikkinen2011-01-171-0/+2
| | * | | | Fix header not found build errorShane Kearns2011-01-171-1/+1
| | * | | | QTBUG-16110 updating the softkeys when app comes to foregroundmread2011-01-171-0/+3
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-177-41/+188
| | |\ \ \ \
| | | * | | | Workaround crash when multiple QNetworkAccessManager instances are usedShane Kearns2011-01-147-41/+188