summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-07 19:15:25 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-07 19:15:25 (GMT)
commit190adb6dc8fe1b97d61a4cb09c77c71d7c0797b6 (patch)
tree3ba21013d4881ef209ee3f89f7c5c332b0d53c3e /doc
parent77fb7ffa69fe0183e8547fca69fc976364d05408 (diff)
parentdf362aff04da1e4b4305df36bd4cc5532449dee9 (diff)
downloadQt-190adb6dc8fe1b97d61a4cb09c77c71d7c0797b6.zip
Qt-190adb6dc8fe1b97d61a4cb09c77c71d7c0797b6.tar.gz
Qt-190adb6dc8fe1b97d61a4cb09c77c71d7c0797b6.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: uic: Improve messages. Tools (uic/rcc): Improve warning messages. QDir: Removed checks for existance of fileEngine QDir and QFileInfo shouldn't lose properties when detaching Another bug-o introduced in fixing QDirPrivate refactoring Reverting QDir::detach introduced earlier QFileInfo: Prepare for engine-less implementation Removed QFileInfoPrivate::initFileEngine Simplify QDir::cd QDir::makeAbsolute could self-destruct on failure QDir::operator= simplification QDirPrivate refactoring QDirPrivate refactoring QDirPrivate refactoring Removed QDirPrivate layer of indirection Refactor QFileInfoPrivate::Data (Round 2) Refactoring QDirPrivate::Data Move QFileInfoPrivate methods to QFileInfoPrivate::Data (1st Round) explicitly remove qt_webkit_version.pri when building with -no-webkit
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions