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-02-183-3/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Eckhart Koppen2011-02-173-27/+20
| |\
| * | Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-173-3/+3
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-171-95/+52
|\ \ \
| * | | RGBA32 -> RGB565 dithering in Meego Graphicssystem,Tero Tiittanen2011-02-171-95/+52
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-173-27/+20
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-173-27/+20
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-163-1/+9
|\ \ \ | |/ /
| * | Made Q_ASSERT meaningful againEckhart Koppen2011-02-161-1/+1
| * | Introduce new flag for splitview support in SymbianSami Merila2011-02-162-0/+8
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-152-5/+33
|\ \ \ | |/ /
| * | Fix for clipping failure in OpenVG paint engine.Jani Hautakangas2011-02-152-5/+33
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-151-0/+9
|\ \ \
| * | | Use QML notation for documenting TextInput::accepted() signal.Andrew den Exter2011-02-151-4/+4
| * | | Document the TextInput accepted() signal.Andrew den Exter2011-02-151-0/+9
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-153-4/+50
|\ \ \ \ | |/ / /
| * | | Fix inheritance of widget input contexts.Andrew den Exter2011-02-153-4/+50
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-141-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Fix for ARMV6 drawhelper blendingJani Hautakangas2011-02-141-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-142-1/+20
|\ \ \ \ | | |_|/ | |/| |
| * | | QStyleSheetStyle: dont crash in PE_WIDGET when widget is nullOlivier Goffart2011-02-142-1/+20
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-141-4/+1
|\ \ \ \
| * | | | Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791Bradley T. Hughes2011-02-141-4/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-143-8/+17
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Worked around a SC issue in S60 3.x vs 5.0 versions.axis2011-02-141-1/+13
| * | | | Apply the gcce link rules for LIBS_PRIVATE too.Liang Qi2011-02-111-3/+3
| * | | | Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.Liang Qi2011-02-111-4/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-1433-29/+494
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Don't leak ScopeChainNode'sAaron Kennedy2011-02-142-3/+41
| * | | | Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-117-6/+6
| * | | | Correct the "module not installed" error handlingAaron Kennedy2011-02-1116-13/+285
| * | | | Flickable uses the flick velocity to determine whether to retain grabMartin Jones2011-02-111-1/+6
| * | | | Make addImportPath() work for windows paths starting with lower caseBea Lam2011-02-112-3/+15
| * | | | Report any exceptions occurring in WorkerScript javascript codeBea Lam2011-02-116-3/+139
| * | | | MouseArea docs - link to onCanceled() from onReleased()Bea Lam2011-02-111-0/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-142-3/+12
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Designer: Slots of main container not visible in signal/slot editor.Friedemann Kleint2011-02-112-3/+12
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-110-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-02-10710-18374/+35733
| |\ \ \ \
* | \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-101-4/+24
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | My 4.7.2 changesKent Hansen2011-02-101-4/+24
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-101-33/+19
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix QFileDialog Symbian native file dialog filename filtering.Miikka Heikkinen2011-02-101-33/+19
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-101-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fix QMAKE_COPY_DIR for mingw+shOswald Buddenhagen2011-02-101-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-1026-16/+6986
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | PathView items were not correctly updated when rootIndex changed.Martin Jones2011-02-103-16/+95
| * | | | Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-1023-0/+6891
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-109-76/+248
|\ \ \ \ \ | |/ / / /
| * | | | Update modules-related tests and docsBea Lam2011-02-108-73/+210