summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Unbreak compilation with ICC when in C++98 mode.Thiago Macieira2011-02-221-9/+11
* Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changesetCristiano di Flora2011-02-221-1/+1
* Fix QNetworkConfigurationManager crash due to null private pointer.Cristiano di Flora2011-02-221-12/+5
* Add Intel Compiler's C++0x feature support macrosThiago Macieira2011-02-211-1/+16
* Remove the assignment-move operator that was a bad copy-pasteThiago Macieira2011-02-211-2/+0
* Fix "array subscript out of bounds" warning with GCC 4.5 in QtOpenGLThiago Macieira2011-02-212-6/+6
* Fix warning about unused parameterThiago Macieira2011-02-211-0/+1
* Fix warning about parentheses about && in ||Thiago Macieira2011-02-211-1/+1
* Fix warning about QLatin1String::operator==(const char*) deprecatedThiago Macieira2011-02-211-2/+2
* Fix silly warnings about initialising in the wrong orderThiago Macieira2011-02-211-4/+4
* Fix the move semantics in QSharedDataPointer and QExplicitSDPThiago Macieira2011-02-211-1/+5
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-181-1/+1
|\
| * Fix compilation error with ARMv5 atomics when T is a const value.Thiago Macieira2011-02-171-1/+1
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-187-119/+59
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-187-102/+59
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-183-4/+4
| | |\ \
| | | * | QImage crash when invalid XPM is read.Niklas Kurkisuo2011-02-181-1/+1
| | | * | Fix an issue with removing rows in a table model.Michael Goddard2011-02-182-3/+3
| | * | | 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-171-17/+0
| | | |\ \ \
| | | * | | | 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 into qt-master-from-4.7Qt Continuous Integration System2011-02-171-17/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-171-17/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-171-17/+0
| | | | |/ / | | | |/| |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-02-171-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix parallel buildsJoão Abecasis2011-02-171-0/+1
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1723-45/+180
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | 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-152-4/+18
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix inheritance of widget input contexts.Andrew den Exter2011-02-152-4/+18
| * | | | | 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-141-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | QStyleSheetStyle: dont crash in PE_WIDGET when widget is nullOlivier Goffart2011-02-141-1/+1
| * | | | | 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-141-1/+13
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Worked around a SC issue in S60 3.x vs 5.0 versions.axis2011-02-141-1/+13
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-1411-25/+93
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Don't leak ScopeChainNode'sAaron Kennedy2011-02-141-3/+1
| | * | | | Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-116-4/+4