summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-015-66/+72
|\
| * Add the auto detection for OpenGL in configure for makefile build system on S...Liang Qi2011-04-012-3/+14
| * Don't display softkeys/statusbar on FS childs of non-FS windowsMiikka Heikkinen2011-04-013-63/+58
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-0120-1070/+1971
|\ \
| * | Manually amend latin1 changeHarald Fernengel2011-04-011-13/+24
| * | QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfe...Michael Hasselmann2011-04-012-4/+78
| * | suppress warnings about ASCII to QString conversionRitt Konstantin2011-03-311-29/+15
| * | take the user defined temp dir into accountRitt Konstantin2011-03-311-6/+10
| * | Compilation break in MSVC2008 and MSVC2005Carlos Manuel Duclos Vergara2011-03-311-1/+1
| * | Remove useless LFLAGSDarryl L. Miles2011-03-312-2/+2
| * | Add docs for QNetworkConfigurationManager's time-consuming constructor.Xizhi Zhu2011-03-311-0/+3
| * | rebuild configureOswald Buddenhagen2011-03-311-0/+0
| * | fix configure.exe option -opengl desktopMark Brand2011-03-311-1/+1
| * | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-31561-16272/+26579
| |\ \
| * | | use mkdir -p for mingw+shOswald Buddenhagen2011-03-311-1/+1
| * | | Ensure the right font is used for rendering text on MacAndy Shaw2011-03-301-1/+3
| * | | QDirIterator returns hidden directories when it should only return filesCarlos Manuel Duclos Vergara2011-03-302-13/+70
| * | | Update Polish translationsJarek Kobus2011-03-297-1025/+1717
| * | | L10n: Update German translations.Friedemann Kleint2011-03-292-3/+75
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-0121-127/+429
|\ \ \ \
| * | | | Add missing test file.Martin Jones2011-04-011-0/+50
| * | | | Changing width of RTL positioner doesn't relayoutMartin Jones2011-04-012-0/+32
| * | | | Fix TextInput auto test failure on mac.Andrew den Exter2011-04-011-3/+10
| * | | | PinchArea and Flickable don't work well enough togetherMartin Jones2011-03-315-111/+219
| * | | | Fix auto test failure.Andrew den Exter2011-03-311-0/+8
| * | | | Once Image sourceSize is set there is no way to clear it.Martin Jones2011-03-314-1/+39
| * | | | Rotation transform with NaN angle can cause crashMartin Jones2011-03-302-1/+7
| * | | | Canceling image download while reading causes crashMartin Jones2011-03-303-3/+7
| * | | | Fix width of TextInput micro focus rectangle.Andrew den Exter2011-03-304-8/+57
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-315-3/+43
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Do not set focus unnecessarily at window activation in SymbianMiikka Heikkinen2011-03-311-1/+2
| * | | | QS60Style: Regression in drawing dialog backgroundSami Merila2011-03-311-1/+2
| * | | | QS60Style: Support menu separator (pt.2)Sami Merila2011-03-311-1/+1
| * | | | Support for new softkey in Symbian^3Titta Heikkala2011-03-313-0/+38
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-314-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed not switching to MeeGo graphicssystem.Samuel Rødal2011-03-301-1/+1
| * | | | Fixed rounding of coordinates pre-transformation in CG paintengine.Samuel Rødal2011-03-291-1/+1
| * | | | Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.Samuel Rødal2011-03-292-2/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-311-15/+19
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | QSoftkeyManager auto test updateTitta Heikkala2011-03-301-15/+19
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-304-9/+16
|\ \ \ \ \ | |/ / / /
| * | | | Corrected case mismatch.axis2011-03-291-1/+1
| * | | | Fixed pro file syntax in demos/spectrumGareth Stockwell2011-03-291-3/+3
| * | | | Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-29679-16869/+33989
| |\ \ \ \
| | * | | | Removed useless Exit button in Symbian^3Titta Heikkala2011-03-281-0/+8
| * | | | | Fix for failing autotest QToolBar/SymbianSami Merila2011-03-291-5/+4
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-304-44/+29
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Return correct boundaries reasons from QTextBoundaryFinder.Andrew den Exter2011-03-303-43/+28
| * | | | | GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-291-1/+11
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |