Skip to content
GitLab
Select Git revision
  1. 30 Apr, 2015 - 2 commits
    • Andras Becsi's avatar
      Prevent conflicting declaration errors of GL typedefs · 3da7df93
      Andras Becsi authored 
      
Including gpu/command_buffer headers in Qt code pollute by
including ui/gl/gl_bindings.h which pulls in system GL headers.
This will cause conflicting declaration of typedefs when included
together with content/gpu and content/common/gpu headers which
pull in gles2_cmd_format.h that forward declares some GL types.

Although the gl_bindings.h header states in a comment that
it should only be included in source files, the inline
implementation of texture_manager.h and some other low-level
GL integration headers nonetheless require gl_bindings.h,
which unfortunately cascades through to our core layer and
may cause problems when Qt code is compiled.

Since getting rid of this include in Chromium's headers is not
feasible due to maintenance costs, making sure that in Qt code
gpu/command_buffer headers are included before content/gpu and
content/common/gpu headers and guarding forward declarations
in gpu/command_buffer/common/gles2_cmd_format.h should be
a sufficient workaround. We can however get rid of the polluting
includes in src/core/gl_surface_qt.cpp, which only requires
forward declarations.

This also includes a SHA1 update for the Chromium submodule.

Task-number: QTBUG-44240
Change-Id: I5813a3663d36e2b565e4fd7f429add7b6f8f8a69
Reviewed-by: default avatarMichael Brüning <michael.bruning@theqtcompany.com>
      v5.5.0-beta1
      3da7df93
    • Szabolcs David's avatar
      Remove Q_UNREACHABLE from DesktopScreenQt::GetDisplayNearestWindow · 07bf8d7c
      Szabolcs David authored 
      
Chromium uses this method when the user attempts to drag.

Task-number: QTBUG-45723
Change-Id: Ibe3946846f0f4e2d2a25ca36e66fa7235d4aecea
Reviewed-by: default avatarAndras Becsi <andras.becsi@theqtcompany.com>
      07bf8d7c
  3. 29 Apr, 2015 - 1 commit
    • Peter Varga's avatar
      Fix prefix build · 8d23e37c
      Peter Varga authored 
      
Deploy resources, locales, icu and plugins into the build directory
instead of install directory. It is necessary when Qt is configured
with -developer-build and -prefix options: the compilation may fail
if user has no write access for install directory.

Task-number: QTBUG-45796
Change-Id: I425f26fcb4b611c255dd744cb9b4eafe16015d6f
Reviewed-by: default avatarAndras Becsi <andras.becsi@theqtcompany.com>
      8d23e37c
  5. 27 Apr, 2015 - 1 commit
  7. 24 Apr, 2015 - 1 commit
  9. 23 Apr, 2015 - 4 commits
  11. 22 Apr, 2015 - 1 commit
  13. 21 Apr, 2015 - 1 commit
  15. 20 Apr, 2015 - 2 commits
  17. 16 Apr, 2015 - 3 commits
  19. 15 Apr, 2015 - 5 commits
  21. 14 Apr, 2015 - 3 commits
  23. 09 Apr, 2015 - 3 commits
  25. 08 Apr, 2015 - 1 commit
  27. 07 Apr, 2015 - 7 commits
  29. 29 Mar, 2015 - 1 commit
  31. 24 Mar, 2015 - 1 commit
  33. 20 Mar, 2015 - 3 commits