summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_mac.mm
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-25 21:34:02 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-25 21:34:02 +1000
commit9ff6bc28d5977bde97e8429328028e46572be445 (patch)
treec3ad9676560a01ee61810ad0710c2df8c67d431f /src/gui/text/qfontengine_mac.mm
parentcb4eb590d4af9978a0d60402f3c4ab99b6f4ede4 (diff)
parent50c09f63d31ba92b4035d47365e01f5fb65a9cc1 (diff)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix bug in QStringToBSTR. Fix regression in ListView Fixed resource leak when setting QProgressBar style sheet Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac don't lock the global mutex if there is nothing to protect fix possible race conditions simplify the code by using QSystemLibrary a bit smarter use QSystemLibrary::resolve() instead of GetProcAddress() win API calls nativewifi bearer plugin: prefer DLL Safe Search mode make QElapsedTimer use QSystemLibrary on win QTBUG-21058: Fix for possible crashes in QTextControl::setCursorWidth() Fix bug in QGraphicsItem::isVisibleTo(). nano-opts, styling fixes don't assume the PATH envvar is latin1-encoded Set missing flags in the option when rendering QTreeView drag pixmap Fix typo when updating accessible treeview selection.
Diffstat (limited to 'src/gui/text/qfontengine_mac.mm')
0 files changed, 0 insertions, 0 deletions