summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase_mac.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-14 08:42:30 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-14 08:42:30 (GMT)
commit0f860c39622996f7de67f19d9913dafd57cc8031 (patch)
tree91d9dcc79d7d50b100aac3dca5ac86326d48f1c1 /src/gui/text/qfontdatabase_mac.cpp
parentaf66d24cd6ba0ec5cbe2d6ecd899a0f1977637eb (diff)
parent1b413c8821d127a8541134d7ec5306bf135ff942 (diff)
downloadQt-0f860c39622996f7de67f19d9913dafd57cc8031.zip
Qt-0f860c39622996f7de67f19d9913dafd57cc8031.tar.gz
Qt-0f860c39622996f7de67f19d9913dafd57cc8031.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Revert "Fix compilation of lrelease on Windows" Fix building the OpenVG graphicssystem on Linux with static libs fix build on windows 7 Disabling DEF files to get around building problems. QDeclarativeDebug: Don't hang if started with ',block' argument QDeclarativeDebug: Fix QJSDebugService if launched with ',block' Fix docs on caching for images loaded by image providers Fixed compile of tst_qscriptextensionplugin on some Windows configurations QDeclarative: fixed clean animation lists DeclarativeObserver: Don't fade in the highlight edge Renamed declarativeobserver plugin to qmldbg_inspector QmlDebugger: adding slots to items in Live Preview QmlDebugger: parsing packets iteratively in the communication protocol qmlplugindump: Bump QtQuick.tooling version to 1.1. qmlplugindump: Dump revision property. qmlplugindump: Fix --path usage with drive letters on Windows. ListView segmentation fault when setting highlight to null DeclarativeObserver: Fixed duplicates in item selection
Diffstat (limited to 'src/gui/text/qfontdatabase_mac.cpp')
0 files changed, 0 insertions, 0 deletions