summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qabstracttextdocumentlayout_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-07 13:54:48 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-07 13:54:48 (GMT)
commit46082389f2a700a1f98826e0c575ab4e31059761 (patch)
treeaa19249a7fb469176fb22adfa9a1b702ae3be6c0 /src/gui/text/qabstracttextdocumentlayout_p.h
parent8031eada2f81963865390b4d899631b09d4ca6f3 (diff)
parent7c8980ee041e874a6c430f01b2daff4955517b03 (diff)
downloadQt-46082389f2a700a1f98826e0c575ab4e31059761.zip
Qt-46082389f2a700a1f98826e0c575ab4e31059761.tar.gz
Qt-46082389f2a700a1f98826e0c575ab4e31059761.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (94 commits) Not possible to enter negative values to widgets with numeric fields QmlViewer: Enable remote qml debugging QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug Improve Flickable dynamics and allow platform specific tweaking. Fixed the declarative headers and includes within qdoc. Removed invalid public slots section. Minor feature fix led to refactoring for i18n's sake. Fixed string-int concatenation issue. Fixed license headers for examples in 4.7 qdoc: Allowed multiple values for certain metadata tags. Removing extra comma in `enum' declaration. Take phonon backend back in qt.iby Mac: p2 combobox regression fix win32-g++: Correct the order of linked Windows libraries Remove SIGBUS emission from QNetworkSession destruction. Remove obsolete files from qt.iby Fix QGradient stop with NaN position on Symbian. win32-g++: Correct the order of linked Windows libraries Fixing a traling space on if statement that fails in Solaris. Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed ...
Diffstat (limited to 'src/gui/text/qabstracttextdocumentlayout_p.h')
0 files changed, 0 insertions, 0 deletions