diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-02 01:49:48 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-02 01:49:48 +1000 |
| commit | 408a522ffa25106334c3b29a4799e0d0a1719291 (patch) | |
| tree | 6594f8e2f5d09d13b88de8fa95d40c069a9d1181 /src/gui/text/qfontengine_x11.cpp | |
| parent | 3cbf4e94d5c02eb97bd56fc65bf354024edc3413 (diff) | |
| parent | 9f71cffea1d5cdac94ae7368ffa7f54183ac33a4 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
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
Diffstat (limited to 'src/gui/text/qfontengine_x11.cpp')
0 files changed, 0 insertions, 0 deletions