summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qs60style.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-12 15:00:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-12 15:00:33 (GMT)
commit51f23350947ba3b46908a1241118096caedf10fe (patch)
treeb054d03000a085912142f5f1266d76a52bf50a7f /src/gui/styles/qs60style.cpp
parentb05b53cd90ef6dcbf6395ba991e0f848415136aa (diff)
parent601fc892705c3aeb751f8bec9924200822f1a85d (diff)
downloadQt-51f23350947ba3b46908a1241118096caedf10fe.zip
Qt-51f23350947ba3b46908a1241118096caedf10fe.tar.gz
Qt-51f23350947ba3b46908a1241118096caedf10fe.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: (49 commits) Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 ...
Diffstat (limited to 'src/gui/styles/qs60style.cpp')
0 files changed, 0 insertions, 0 deletions