summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Corrected a mismerge in GCCE link parameters.axis2011-02-241-1/+1
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-24874-19632/+39788
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-02-221-6/+14
| |\
| | * Designer: Check for 0-spacing when loading grid settings.Friedemann Kleint2011-02-211-6/+14
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-223-15/+23
| |\ \
| | * | 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
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-218-15/+20
| |\ \ \ | | |/ /
| | * | 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
| | * | Fix compilation: Q_UNUSED takes exactly one variable that is unusedThiago Macieira2011-02-211-1/+1
| |/ /
| * | 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-1812-129/+114
| |\ \ \
| | * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-1810-102/+94
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-186-4/+39
| | | |\ \ \
| | | | * | | Added test case for corrupt pixel count in XPM image.Samuel Rødal2011-02-182-0/+14
| | | | * | | 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-183-3/+24
| | | * | | | 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 into qt-master-from-4.7Qt Continuous Integration System2011-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-173-27/+20
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-173-27/+20
| | | | | |/ / / | | | | |/| | |
| * | | | | | | 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 branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-1750-55/+646
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1750-55/+646
| | |\ \ \ \ \ \ | |/ / / / / / / | | | _ / / / / | | | / / / /
| | * | | | | 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