1. 24 Nov, 2016 2 commits
    • Niels Breet's avatar
      Merge branch 'qlocale_tatar' into 'mer-stable' · 6ab35396
      Niels Breet authored
      [qtbase] QLocale data regenerated with initial Tatar locale support. Fixes MER#1707
      
      The Tatar locale data is taken from the recent CLDR tag (v30.0.2), but all other locales kept the same version (v23.1). The language data is inserted in between, so it moves a lot of other locale data, which increases the diff.
      
      See merge request !13
      6ab35396
    • Alexandr Akulich's avatar
      [qtbase] QLocale data regenerated with initial Tatar locale support. Fixes MER#1707 · 2e48ca0e
      Alexandr Akulich authored
      The Tatar locale data is taken from the recent CLDR tag (v30.0.2), but all other
      locales kept the same version (v23.1). The language data is inserted in between,
      so it moves a lot of other locale data, which increases the diff.
      2e48ca0e
  2. 19 Apr, 2016 2 commits
  3. 04 Jan, 2016 1 commit
    • lpotter's avatar
      Merge branch 'jb33794' into 'mer-stable' · be8e74a2
      lpotter authored
      Fix the problem with QNetworkAccessManager getting stuck in NotAccessible state
      
      It appears that `QNetworkAccessManager` can keep receiving queued signals even after it has cleared its reference to `QNetworkSession` and disconnected the slots. That can mess up `networkAccessible` state. Particularly, `QNetworkAccessManager` can get stuck in `NotAccessible` state and refuse to submit new network requests until the next online state change signal pulls it out of this state.
      
      There still may be a possibility that a signal from an old `QNetworkSession` could arrive when `QNetworkAccessManager` has already switched to another `QNetworkSession`, but this scenario is probably broken by design, since for whatever reason `QNetworkAccessManager` is only tracking one `QNetworkSession`. In any case, it's far less likely than the scenario which I was trying to fix.
      
      See merge request !3
      be8e74a2
  4. 30 Dec, 2015 3 commits
  5. 29 Dec, 2015 2 commits
  6. 20 Oct, 2015 1 commit
  7. 16 Oct, 2015 2 commits
  8. 12 Oct, 2015 1 commit
    • Pekka Vuorela's avatar
      [qtbase] Fix rectangle shown with hindi text. Fixes JB#32619 · 6ef9198f
      Pekka Vuorela authored
      After U+0930 U+0947 U+0902 and linefeed, an extra rectangle was rendered
      with QML Text element.
      
      Conflicts: tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
      -> changes omitted
      
      Original commit 198009db
      
      Fix several regressions in font selection
      
      In Qt 5.3.0 a change was added which automatically adapts Common
      script to surrounding scripts in accordance with the Unicode tr#24.
      
      This broke *a lot* of cases of font selection because the font
      selection algorithm is not prepared for handling characters with
      adapted scripts. We need to disable this change for now and redo it
      later with patches to font selection to avoid the regressions.
      
      [ChangeLog][Text] Fixed several regressions in font selection when
      combining different writing systems in the same text.
      
      Task-number: QTBUG-39930
      Task-number: QTBUG-39860
      Change-Id: Id02b5ae2403c06542ed5d81e7c4deb2e0c7d816e
      Reviewed-by: default avatarKonstantin Ritt <ritt.ks@gmail.com>
      
      # Conflicts:
      #	tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
      6ef9198f
  9. 08 Sep, 2015 1 commit
  10. 01 Sep, 2015 1 commit
  11. 21 Aug, 2015 1 commit
  12. 18 Aug, 2015 1 commit
  13. 17 Aug, 2015 1 commit
  14. 14 Aug, 2015 1 commit
  15. 06 Aug, 2015 2 commits
  16. 23 Jul, 2015 2 commits
  17. 19 Jul, 2015 1 commit
    • Lorn Potter's avatar
      [qtbase] Fixes MER#1028 report correct NetworkAccessibility · caa19861
      Lorn Potter authored
      manual merge of
      
      From f4e32ceea6655fdab6b7ddfec98cfac61527b89f Mon Sep 17 00:00:00 2001
      From: Lorn Potter <lorn.potter@gmail.com>
      Date: Tue, 2 Jun 2015 13:22:23 +1000
      Subject: [PATCH] Make sure to report correct NetworkAccessibility
      
      Task-number: QTBUG-46323
      Change-Id: Ibdeb3280091a97d785d4314340678a63e88fb219
      caa19861
  18. 09 Jun, 2015 2 commits
    • Mikko Harju's avatar
      Merge pull request #42 from mikkoharju/platformsurfaceevent · 3f0086c1
      Mikko Harju authored
      Cherry-pick QPlatformSurfaceEvent
      3f0086c1
    • Mikko Harju's avatar
      Cherry-pick QPlatformSurfaceEvent · 8f1c7f41
      Mikko Harju authored
      Some conflicts in tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
      
      Original commit message:
      
      commit c5ecabb7
      Author: Sean Harmer <sean.harmer@kdab.com>
      Date:   Sat Nov 15 11:40:51 2014 +0000
      
          Send events when platform surfaces are created/about to be destroyed
      
          These synchronously delivered events allow applications to correctly
          and conveniently handle native platform surfaces being destroyed. This
          is particularly useful when doing rendering on a non-gui thread as it
          allows to shutdown rendering before the native surface gets destroyed
          from under us.
      
          Task-number: QTBUG-42476
          Task-number: QTBUG-42483
          Change-Id: I63f41bbdb32f281d0f3b8ec2537eb2b0361f3bb3
      Reviewed-by: default avatarLaszlo Agocs <laszlo.agocs@digia.com>
      8f1c7f41
  19. 26 May, 2015 1 commit
  20. 13 May, 2015 1 commit
  21. 12 May, 2015 5 commits
  22. 11 May, 2015 2 commits
    • sletta's avatar
      Merge pull request #37 from sletta/flush-glyph-cache · 4b71f8d7
      sletta authored
      [mer] Work around missing glyphs problem.
      4b71f8d7
    • sletta's avatar
      [mer] Work around missing glyphs problem. · 7606b1d1
      sletta authored
      This problem seems to manifest itself primarily on libhybris based
      systems, but this flush seems to fix it.
      
      It also includes a warning for an out-of-memory situation which would
      also result in missing glyphs, though that is not the one we are
      normally hitting.
      
      Change-Id: I177d78cf9c70bd71b939fa72215bd3f6a977ba26
      7606b1d1
  23. 14 Apr, 2015 2 commits
  24. 13 Apr, 2015 2 commits