summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* --warningsHarald Fernengel2010-12-131-2/+2
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-111-1/+1
|\
| * We should not cache ICO files.Alexis Menard2010-12-101-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-1020-313/+217
|\ \
| * | Proposed fix for QTBUG-10499Christian.Ehrlicher2010-12-101-6/+6
| * | remove useless overloadKonstantin Ritt2010-12-101-2/+2
| * | simplify polling code a bitKonstantin Ritt2010-12-102-33/+8
| * | promote QNetworkConfigurationManager::updateConfigurations() to a slotKonstantin Ritt2010-12-101-1/+3
| * | simplify waitForOpened()Konstantin Ritt2010-12-101-9/+6
| * | fix CV-qualifiers for some membersKonstantin Ritt2010-12-102-13/+13
| * | minor clean-ups and styling fixesKonstantin Ritt2010-12-1019-250/+180
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-101-4/+4
|\ \
| * | Improving memory leak analysis for argv, envpmread2010-12-101-4/+4
| |/
* | QNetworkReply: set to finished for synchronous requestsPeter Hartmann2010-12-101-0/+1
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-0982-584/+1279
|\ \ | |/ |/|
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-0882-584/+1279
| |\
| | * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-0882-584/+1279
| | |\
| | | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-071-0/+3
| | | |\
| | | | * Fix QTextEdit::selectAll crash from textChanged()Jiang Jiang2010-12-061-0/+3
| | | * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-0781-584/+1276
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-0681-584/+1276
| | | | |\ \ | | | | | |/
| | | | | * Fix proxy reading from gconf so that it is only done once / session.Jukka Rissanen2010-12-062-4/+15
| | | | | * Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
| | | | | * Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-022-2/+33
| | | | | * Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| | | | | * Ensure semi-transparent rects paint correctly with radius == size/2.Martin Jones2010-12-021-0/+6
| | | | | * Rectangle should not paint with negative width or heightChristopher Ham2010-12-021-0/+2
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-12/+26
| | | | | |\
| | | | | | * ListView header is not visible initially.Martin Jones2010-12-012-12/+26
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-011-34/+47
| | | | | |\ \
| | | | | | * | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-12-01141-1044/+2288
| | | | | | |\ \
| | | | | | * | | Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-011-1/+1
| | | | | |\ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | | | * | | Fix two minor doc errorsAndy Shaw2010-12-011-1/+1
| | | | | | | |/ | | | | | | |/|
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-2/+26
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | | * | Change pen correctly when drawing cached textAaron Kennedy2010-12-011-0/+8
| | | | | | * | Fix BorderImage painting at sizes less than margin size.Martin Jones2010-12-011-2/+18
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-305-6/+21
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Joona Petrell2010-11-3044-523/+867
| | | | | | |\ \
| | | | | | * | | Fix resource leak in QEgl::getCompatibleVisualld()Rhys Weatherley2010-11-291-1/+3
| | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-266-5/+21
| | | | | | |\ \ \
| | | | | | | * | | Fixed OpenGL state getting out of sync.Samuel Rødal2010-11-262-0/+12
| | | | | | | * | | Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3aFriedemann Kleint2010-11-261-1/+1
| | | | | | | * | | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-264-5/+9
| | | | | * | | | | Ensure header is considered when positioning content with snapping.Martin Jones2010-11-302-17/+26
| | | | | * | | | | Fix integer overflow in QDeclarativeItemPrivate::origin enumerationJoona Petrell2010-11-301-1/+1
| | | | | * | | | | Correct ownership semantics for QObject derived typesAaron Kennedy2010-11-301-2/+9
| | | | | * | | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| | | | | * | | | | Fix Browser.qml warningsJoona Petrell2010-11-301-1/+1