summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-3120-265/+222
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-301-20/+10
| |\
| | * Return correct boundaries reasons from QTextBoundaryFinder.Andrew den Exter2011-03-301-20/+10
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-281-1/+1
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-283-62/+69
| |\ \ \
| | * | | QSysInfo support for next generation Symbian devices.Miikka Heikkinen2011-03-243-62/+65
| | * | | Call FixNativeOrientation on Symbian for certain fullscreen qml views.Laszlo Agocs2011-03-241-0/+4
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-2714-182/+135
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-224-7/+33
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-03-211-3/+3
| | |\ \ \ \ \
| | | * | | | | Doc: Removed links to obsolete API in QResourceGeir Vattekar2011-03-171-3/+3
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-092-1/+6
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Doc: Small change to QByteArray::resize()Geir Vattekar2011-03-071-1/+1
| | * | | | | | Doc: Small correction to QMap iterator docsGeir Vattekar2011-03-071-1/+1
| | * | | | | | Doc: Work on QTranslator::load()Geir Vattekar2011-03-071-4/+9
| | * | | | | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-281-1/+6
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-239-18/+25
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'mimir' into 4.7David Boddie2011-02-231-73/+17
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | qdoc: Added the \span command.Martin Smith2011-01-241-17/+17
| | | * | | | | | | | qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-071-73/+17
| | | * | | | | | | | Merge branch '4.7' into mimirDavid Boddie2010-12-153-19/+52
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-181-0/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc: Small update to QHistoryState::setDefaultState()Geir Vattekar2011-02-181-0/+3
| | * | | | | | | | | | | Doc: Clarified the -1 return value of QIODevice::readData().David Boddie2011-02-171-4/+5
| | |/ / / / / / / / / /
| | * | | | | | | | | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-088-96/+96
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-252-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Fix QUnifiedTimer bugAlan Alpert2011-03-242-1/+8
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-221-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-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.Miikka Heikkinen2011-03-211-1/+1
* | | | | | | | | | | QDirIterator returns hidden directories when it should only return filesCarlos Manuel Duclos Vergara2011-03-301-13/+15
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Report that an update is needed if no update was doneThiago Macieira2011-03-281-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Bump Qt version to 4.7.4Timo Turunen2011-03-211-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-152-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-142-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Support to build Qt for Symbian on Mac OS X with gcce compiler.axis2011-02-211-1/+1
| | * | | | | | | Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-181-1/+1
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-101-2/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Cast int to HALData::TAttribute for QT_HALData_ENumCpus and compile with RVCT4.Liang Qi2011-03-101-1/+1
| * | | | | | | | Get the number of cores from HAL on Symbian.Liang Qi2011-03-101-2/+25
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-101-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Bump Qt version to 4.7.3Timo Turunen2011-03-091-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fix for misplaced endif in qglobal.h.Laszlo Agocs2011-03-091-0/+1
* | | | | | | | Multiple screen support for Symbian in QDeskopWidget.Laszlo Agocs2011-03-091-0/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-042-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-042-1/+6
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-231-1/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTSJani Hautakangas2011-02-231-1/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-202-7/+7
|\ \ \ \ \ \
| * | | | | | Use QElapsedTimer in QFutureInterface.Thiago Macieira2011-02-162-7/+7