Sākums Izpētīt Palīdzība
Pierakstīties
PUBLIC_REPOS
/
buildroot
spogulis no git://git.buildroot.net/buildroot
2
1
Atdalīts 0
Faili
Koks: 7eafaa6f72
Atzari Tagi
buildroot
/
package
/
qt5
/
qt5base
/
0008-QtGui-force-image-dir-in-include_path.patch

0008-QtGui-force-image-dir-in-include_path.patch 3.1 KB
Vēsture Neapstrādāts

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889 
  1. From 7f282aa9f718389199b95b7f53ecd6401172fcc6 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
    3. 

  3. Date: Fri, 24 Jul 2015 13:18:29 +0200
    4. 

  4. Subject: [PATCH 1/1] fix build with no built-in image handlers
    5. 

  5. 

  6. the handlers' .pri files added $$PWD to INCLUDEPATH to make the files
    7. 

  7. self-contained when used externally, but this polluted the include path
    8. 

  8. of the gui module itself, thus hiding incorrect use of QPA includes.
    9. 

  9. 

  10. Task-number: QTBUG-47400
    11. 

  11. Change-Id: I576469a71e8ded0b409d62687999c0fa884613f9
    12. 

  12. Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
    13. 

  13. ---
    14. 

  14.  src/gui/image/qgifhandler.pri          | 1 -
    15. 

  15.  src/gui/image/qjpeghandler.pri         | 1 -
    16. 

  16.  src/gui/image/qpnghandler.pri          | 1 -
    17. 

  17.  src/gui/painting/qbrush.cpp            | 2 +-
    18. 

  18.  src/plugins/imageformats/gif/gif.pro   | 1 +
    19. 

  19.  src/plugins/imageformats/jpeg/jpeg.pro | 1 +
    20. 

  20.  6 files changed, 3 insertions(+), 4 deletions(-)
    21. 

  21. 

  22. diff --git a/src/gui/image/qgifhandler.pri b/src/gui/image/qgifhandler.pri
    23. 

  23. index 6eb0751..ec33101 100644
    24. 

  24. --- a/src/gui/image/qgifhandler.pri
    25. 

  25. +++ b/src/gui/image/qgifhandler.pri
    26. 

  26. @@ -1,4 +1,3 @@
    27. 

  27.  # common to plugin and built-in forms
    28. 

  28. -INCLUDEPATH *= $$PWD
    29. 

  29.  HEADERS += $$PWD/qgifhandler_p.h
    30. 

  30.  SOURCES += $$PWD/qgifhandler.cpp
    31. 

  31. diff --git a/src/gui/image/qjpeghandler.pri b/src/gui/image/qjpeghandler.pri
    32. 

  32. index c8de33d..de40c67 100644
    33. 

  33. --- a/src/gui/image/qjpeghandler.pri
    34. 

  34. +++ b/src/gui/image/qjpeghandler.pri
    35. 

  35. @@ -1,5 +1,4 @@
    36. 

  36.  # common to plugin and built-in forms
    37. 

  37. -INCLUDEPATH *= $$PWD
    38. 

  38.  HEADERS += $$PWD/qjpeghandler_p.h
    39. 

  39.  SOURCES += $$PWD/qjpeghandler.cpp
    40. 

  40.  contains(QT_CONFIG, system-jpeg) {
    41. 

  41. diff --git a/src/gui/image/qpnghandler.pri b/src/gui/image/qpnghandler.pri
    42. 

  42. index aca7e2c..9ab175d 100644
    43. 

  43. --- a/src/gui/image/qpnghandler.pri
    44. 

  44. +++ b/src/gui/image/qpnghandler.pri
    45. 

  45. @@ -1,4 +1,3 @@
    46. 

  46. -INCLUDEPATH *= $$PWD
    47. 

  47.  HEADERS += $$PWD/qpnghandler_p.h
    48. 

  48.  SOURCES += $$PWD/qpnghandler.cpp
    49. 

  49.  contains(QT_CONFIG, system-png) {
    50. 

  50. diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
    51. 

  51. index 670717c..c3a0f5c 100644
    52. 

  52. --- a/src/gui/painting/qbrush.cpp
    53. 

  53. +++ b/src/gui/painting/qbrush.cpp
    54. 

  54. @@ -35,7 +35,7 @@
    55. 

  55.  #include "qpixmap.h"
    56. 

  56.  #include "qbitmap.h"
    57. 

  57.  #include "qpixmapcache.h"
    58. 

  58. -#include "qplatformpixmap.h"
    59. 

  59. +#include <qpa/qplatformpixmap.h>
    60. 

  60.  #include "qdatastream.h"
    61. 

  61.  #include "qvariant.h"
    62. 

  62.  #include "qline.h"
    63. 

  63. diff --git a/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro
    64. 

  64. index 898f06e..2a5048b 100644
    65. 

  65. --- a/src/plugins/imageformats/gif/gif.pro
    66. 

  66. +++ b/src/plugins/imageformats/gif/gif.pro
    67. 

  67. @@ -5,6 +5,7 @@ PLUGIN_CLASS_NAME = QGifPlugin
    68. 

  68.  load(qt_plugin)
    69. 

  69.  
    70. 

  70.  include(../../../gui/image/qgifhandler.pri)
    71. 

  71. +INCLUDEPATH += ../../../gui/image
    72. 

  72.  SOURCES += $$PWD/main.cpp
    73. 

  73.  HEADERS += $$PWD/main.h
    74. 

  74.  OTHER_FILES += gif.json
    75. 

  75. diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
    76. 

  76. index 45bf7bb..e33fde1 100644
    77. 

  77. --- a/src/plugins/imageformats/jpeg/jpeg.pro
    78. 

  78. +++ b/src/plugins/imageformats/jpeg/jpeg.pro
    79. 

  79. @@ -9,6 +9,7 @@ QT += core-private
    80. 

  80.  QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)"
    81. 

  81.  
    82. 

  82.  include(../../../gui/image/qjpeghandler.pri)
    83. 

  83. +INCLUDEPATH += ../../../gui/image
    84. 

  84.  SOURCES += main.cpp
    85. 

  85.  HEADERS += main.h
    86. 

  86.  OTHER_FILES += jpeg.json
    87. 

  87. -- 
    88. 

  88. 2.1.0
    89. 

  89.