diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-06 12:48:55 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-06 12:48:55 (GMT) |
commit | 72bd10eed1f15d8ef3c233acb51212f18bc02f35 (patch) | |
tree | a9e69cb8754ca771a42baa021c67d5f4d892b924 /src/gui/text/qfont.h | |
parent | 6cc648cd21b31c79660661ca986e488215c6b846 (diff) | |
parent | 5786c9c3d320fbd5854b883155ade2e834d0e32b (diff) | |
download | Qt-72bd10eed1f15d8ef3c233acb51212f18bc02f35.zip Qt-72bd10eed1f15d8ef3c233acb51212f18bc02f35.tar.gz Qt-72bd10eed1f15d8ef3c233acb51212f18bc02f35.tar.bz2 |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (46 commits)
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
drop the SysV semaphores -specific code out from QWSSignalHandler
minor refactoring of the QWSLock class
simplify the code by using the EINTR_LOOP macro
simplify the semaphores initialization
minor refactoring of the QLock class
add a warning on an incorrect usage of QLock
make sure we really clear all locks
fix build with QT_NO_QWS_SIGNALHANDLER
use a printErr() function instead of std::cerr like in lupdate
Re-apply licenseheader text in source files for qt4.8
Fix build in C++0x mode
skip the ipv6 Host checking for the moment, since it fails on Windows XP. will fix later
Added some of my Qt 4.8 changes to the changelog
remove duplicate message
Update bearer startup code in network autotests
symbian socket engine: share ip address conversion code
fix "Host" header of ipv6 URLs in QNAM
uic: Use QString::fromUtf8 for QUrl properties.
license header check: fix exception for URL TLD table
...
Diffstat (limited to 'src/gui/text/qfont.h')
0 files changed, 0 insertions, 0 deletions