Reviewing merge request #1260: improvements for the QFontEngineQPF1

- make it work without mmap(2) support;
- fix memory leaking on Integrity;
- minor code clean-up

Commits that would be merged:

Version 3
  • Version 1
  • Version 1
  • Version 2
  • Version 2
  • Version 3
  • d5631f1
  • af220a7

    • make QFontEngineQPF1 work even without mmap(2) support

  • b7757c6

    • remove the old compatibility code

  • e788beb

    • minor optimization

Showing d5631f1-af220a7

Comments

Pushed new version 1

avatar Konstantin Ritt | 2011-06-12 02:03:11 UTC

Pushed new version 2

avatar Konstantin Ritt | 2011-06-12 03:26:14 UTC

Pushed new version 2

avatar Konstantin Ritt | 2011-06-12 03:26:14 UTC

→ State changed from New to Revise and resubmit

Doesn’t compile:

/home/harald/qt/qt/src/gui/text/qfontengine_qws.cpp:336:46: error: invalid conversion from ‘char’ to ‘uchar’

avatar Harald Fernengel | 2011-06-21 12:20:52 UTC

→ State changed from Revise and resubmit to Updated

I see the typo which causes this build failure but it was built ok with the gcc-nto, I swear! :)

well, updated; should be ok now.

avatar Konstantin Ritt | 2011-06-21 18:22:02 UTC

→ State changed from Updated to Merged

Except for breaking compilation when DEBUG_FONTENGINE is set, the patch is great ;)

No worries, I've fixed that now (remember to search for occurrences of variable use when you rename them).

Thanks for your contribution!
Harald

avatar Harald Fernengel | 2011-07-01 11:16:33 UTC

thanks

avatar Konstantin Ritt | 2011-07-01 11:41:33 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository