diff options
author | Fatih Aşıcı <fatih.asici@gmail.com> | 2013-09-20 08:43:10 +0300 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2013-10-26 14:00:54 +0200 |
commit | 5d85af61b7a66751ec6240bb14f7517a6633f5e7 (patch) | |
tree | a2f10cfdc2ccac5adaa0895790d10008fe9d38a2 /package/qt5/qt5base/qt5base-0002-mkspecs-files.patch | |
parent | 129abd31b7ef3e3c3c4f43324e23367f942940c9 (diff) | |
download | buildroot-5d85af61b7a66751ec6240bb14f7517a6633f5e7.tar.gz buildroot-5d85af61b7a66751ec6240bb14f7517a6633f5e7.zip |
qt5: bump to 5.1.1
Following patches are removed since they are upstreamed:
- qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
- qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
Remove "-nomake demos" from configure options since "demos" directory is
merged into examples.
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5base/qt5base-0002-mkspecs-files.patch')
-rw-r--r-- | package/qt5/qt5base/qt5base-0002-mkspecs-files.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch index bfa9c15836..e406cfc278 100644 --- a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch +++ b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch @@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,43 @@ +@@ -0,0 +1,44 @@ +MAKEFILE_GENERATOR = UNIX -+CONFIG += incremental gdb_dwarf_index ++CONFIG += incremental gdb_dwarf_index +QMAKE_INCREMENTAL_STYLE = sublib + +include(../../common/linux.conf) @@ -41,6 +41,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf +# modifications to linux.conf +QMAKE_AR = $${BUILDROOT_CROSS_COMPILE}ar cqs +QMAKE_OBJCOPY = $${BUILDROOT_CROSS_COMPILE}objcopy ++QMAKE_NM = $${BUILDROOT_CROSS_COMPILE}nm -P +QMAKE_STRIP = $${BUILDROOT_CROSS_COMPILE}strip + +#modifications to gcc-base.conf |