Skip to content
Snippets Groups Projects
Commit 141b1754 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

BUG: qt4 freetype test should not look in /usr/include first

parent 323cbc0c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
SuperBuild/patches/QT4/qt4-1-minbuild-all.diff
+ 16
− 6
View file @ 141b1754
diff -burN qt-everywhere-opensource-src-4.8.7.orig/config.tests/unix/freetype/freetype.pri qt-everywhere-opensource-src-4.8.7/config.tests/unix/freetype/freetype.pri
--- qt-everywhere-opensource-src-4.8.7.orig/config.tests/unix/freetype/freetype.pri 2017-08-18 10:54:50.327911982 +0200
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/freetype/freetype.pri 2017-08-23 15:20:17.132268013 +0200
@@ -1,5 +1,5 @@
!cross_compile {
- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+ TRY_INCLUDEPATHS = $$INCLUDEPATH $$QMAKE_INCDIR $$QMAKE_INCDIR_X11
# LSB doesn't allow using headers from /include or /usr/include
linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
for(p, TRY_INCLUDEPATHS) {
diff -burN qt-everywhere-opensource-src-4.8.7.orig/projects.pro qt-everywhere-opensource-src-4.8.7/projects.pro
--- qt-everywhere-opensource-src-4.8.7.orig/projects.pro 2017-08-18 10:54:46.519887277 +0200
+++ qt-everywhere-opensource-src-4.8.7/projects.pro 2017-08-23 14:33:05.289398427 +0200
+++ qt-everywhere-opensource-src-4.8.7/projects.pro 2017-08-23 15:20:03.224174152 +0200
@@ -11,7 +11,7 @@
symbian|integrity {
QT_BUILD_PARTS = libs tools examples demos
......@@ -12,7 +22,7 @@ diff -burN qt-everywhere-opensource-src-4.8.7.orig/projects.pro qt-everywhere-op
contains(QT_BUILD_PARTS, translations) {
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/gui/image/qjpeghandler.pri qt-everywhere-opensource-src-4.8.7/src/gui/image/qjpeghandler.pri
--- qt-everywhere-opensource-src-4.8.7.orig/src/gui/image/qjpeghandler.pri 2017-08-18 10:54:45.407880063 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/gui/image/qjpeghandler.pri 2017-08-23 14:32:27.641149748 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/gui/image/qjpeghandler.pri 2017-08-23 15:20:03.292174610 +0200
@@ -4,7 +4,7 @@
SOURCES += $$PWD/qjpeghandler.cpp
contains(QT_CONFIG, system-jpeg) {
......@@ -24,7 +34,7 @@ diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/gui/image/qjpeghandler.pr
}
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/graphicssystems/graphicssystems.pro qt-everywhere-opensource-src-4.8.7/src/plugins/graphicssystems/graphicssystems.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/plugins/graphicssystems/graphicssystems.pro 2017-08-18 10:54:45.583881205 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/graphicssystems/graphicssystems.pro 2017-08-23 14:32:27.661149879 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/graphicssystems/graphicssystems.pro 2017-08-23 15:20:03.292174610 +0200
@@ -1,5 +1,4 @@
TEMPLATE = subdirs
-SUBDIRS += trace
......@@ -33,7 +43,7 @@ diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/graphicssystems/g
SUBDIRS += openvg
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/imageformats/imageformats.pro qt-everywhere-opensource-src-4.8.7/src/plugins/imageformats/imageformats.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/plugins/imageformats/imageformats.pro 2017-08-18 10:54:45.583881205 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/imageformats/imageformats.pro 2017-08-23 14:32:27.661149879 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/imageformats/imageformats.pro 2017-08-23 15:20:03.292174610 +0200
@@ -3,7 +3,7 @@
!contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg
!contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif
......@@ -45,7 +55,7 @@ diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/imageformats/imag
!contains(QT_CONFIG, no-tga):SUBDIRS += tga
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/plugins.pro qt-everywhere-opensource-src-4.8.7/src/plugins/plugins.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/plugins/plugins.pro 2017-08-18 10:54:45.599881309 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/plugins.pro 2017-08-23 14:32:27.661149879 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/plugins.pro 2017-08-23 15:20:03.292174610 +0200
@@ -1,16 +1,16 @@
TEMPLATE = subdirs
......@@ -74,7 +84,7 @@ diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/plugins.pro qt-ev
contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/src.pro qt-everywhere-opensource-src-4.8.7/src/src.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/src.pro 2017-08-18 10:54:46.487887069 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/src.pro 2017-08-23 14:32:27.661149879 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/src.pro 2017-08-23 15:20:03.292174610 +0200
@@ -4,7 +4,7 @@
unset(SRC_SUBDIRS)
win32:SRC_SUBDIRS += src_winmain
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment